[MediaWiki-commits] [Gerrit] labs...stashbot[master]: Guard against degenerate messages in #wikimedia-cloud
BryanDavis has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401202 ) Change subject: Guard against degenerate messages in #wikimedia-cloud .. Guard against degenerate messages in #wikimedia-cloud Change-Id: I1a06d3bf807bda5772f328dc91c9d3f19448ee95 --- M stashbot/sal.py 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/stashbot refs/changes/02/401202/1 diff --git a/stashbot/sal.py b/stashbot/sal.py index 850b5ce..8595040 100644 --- a/stashbot/sal.py +++ b/stashbot/sal.py @@ -91,7 +91,17 @@ bang['nick'], bang['message'] = bang['message'].split(None, 1) if channel in ['#wikimedia-labs', '#wikimedia-cloud']: -bang['project'], bang['message'] = bang['message'].split(None, 1) +parts = bang['message'].split(None, 1) +if len(parts) < 2: +if respond_to_channel: +self.irc.respond( +conn, event, +('%s: Missing project or message? ' +'Expected !log ') % bang['nick'] +) +return + +bang['project'], bang['message'] = parts if bang['project'] not in self._get_projects(): self.logger.warning('Invalid project "%s"', bang['project']) if respond_to_channel: -- To view, visit https://gerrit.wikimedia.org/r/401202 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1a06d3bf807bda5772f328dc91c9d3f19448ee95 Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/stashbot Gerrit-Branch: master Gerrit-Owner: BryanDavis ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Special:ProtectedTitles: Use OOUI in HTMLForm
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401201 ) Change subject: Special:ProtectedTitles: Use OOUI in HTMLForm .. Special:ProtectedTitles: Use OOUI in HTMLForm Bug: T117723 Change-Id: Icd73fa43f237515c3eabf66d1d5f62171d8619ed --- M includes/specials/SpecialProtectedtitles.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/01/401201/1 diff --git a/includes/specials/SpecialProtectedtitles.php b/includes/specials/SpecialProtectedtitles.php index 8c69a96..7e4553b 100644 --- a/includes/specials/SpecialProtectedtitles.php +++ b/includes/specials/SpecialProtectedtitles.php @@ -133,7 +133,7 @@ 'levelmenu' => $this->getLevelMenu( $level ) ]; - $htmlForm = new HTMLForm( $formDescriptor, $this->getContext() ); + $htmlForm = HTMLForm::factory( 'ooui', $formDescriptor, $this->getContext() ); $htmlForm ->setMethod( 'get' ) ->setWrapperLegendMsg( 'protectedtitles' ) -- To view, visit https://gerrit.wikimedia.org/r/401201 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icd73fa43f237515c3eabf66d1d5f62171d8619ed Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Prtksxna ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Special:ProtectedTitles: Use HTMLForm
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401200 ) Change subject: Special:ProtectedTitles: Use HTMLForm .. Special:ProtectedTitles: Use HTMLForm Bug: T117723 Change-Id: Idbf924a2a0e6348a32ab48a0e39b812400a6c9af --- M includes/specials/SpecialProtectedtitles.php 1 file changed, 26 insertions(+), 32 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/00/401200/1 diff --git a/includes/specials/SpecialProtectedtitles.php b/includes/specials/SpecialProtectedtitles.php index fa9033c..8c69a96 100644 --- a/includes/specials/SpecialProtectedtitles.php +++ b/includes/specials/SpecialProtectedtitles.php @@ -120,35 +120,26 @@ $title = $this->getPageTitle(); $special = htmlspecialchars( $title->getPrefixedDBkey() ); - return "\n" . - '' . - Xml::element( 'legend', [], $this->msg( 'protectedtitles' )->text() ) . - Html::hidden( 'title', $special ) . " \n" . - $this->getNamespaceMenu( $namespace ) . " \n" . - $this->getLevelMenu( $level ) . " \n" . - " " . Xml::submitButton( $this->msg( 'protectedtitles-submit' )->text() ) . "\n" . - ""; - } - - /** -* Prepare the namespace filter drop-down; standard namespace -* selector, sans the MediaWiki namespace -* -* @param string|null $namespace Pre-select namespace -* @return string -*/ - function getNamespaceMenu( $namespace = null ) { - return Html::namespaceSelector( - [ + $formDescriptor = [ + 'namespace' => [ + 'class' => 'HTMLSelectNamespace', + 'name' => 'namespace', + 'id' => 'namespace', + 'cssclass' => 'namespaceselector', 'selected' => $namespace, 'all' => '', 'label' => $this->msg( 'namespace' )->text() - ], [ - 'name' => 'namespace', - 'id' => 'namespace', - 'class' => 'namespaceselector', - ] - ); + ], + 'levelmenu' => $this->getLevelMenu( $level ) + ]; + + $htmlForm = new HTMLForm( $formDescriptor, $this->getContext() ); + $htmlForm + ->setMethod( 'get' ) + ->setWrapperLegendMsg( 'protectedtitles' ) + ->setSubmitText( $this->msg( 'protectedtitles-submit' )->text() ); + + return $htmlForm->prepareForm()->getHTML( false ); } /** @@ -176,14 +167,17 @@ } // Third pass generates sorted XHTML content foreach ( $m as $text => $type ) { - $selected = ( $type == $pr_level ); - $options[] = Xml::option( $text, $type, $selected ); + $options[ $text ] = $type; } - return Xml::label( $this->msg( 'restriction-level' )->text(), $this->IdLevel ) . ' ' . - Xml::tags( 'select', - [ 'id' => $this->IdLevel, 'name' => $this->IdLevel ], - implode( "\n", $options ) ); + return [ + 'type' => 'select', + 'options' => $options, + 'value' => $pr_lever, + 'label' => $this->msg( 'restriction-level' )->text(), + 'name' => $this->IdLevel, + 'id' => $this->IdLevel + ]; } protected function getGroupName() { -- To view, visit https://gerrit.wikimedia.org/r/401200 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idbf924a2a0e6348a32ab48a0e39b812400a6c9af Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Prtksxna ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: wikidata: Install wikibase using individual extensions
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/400999 ) Change subject: wikidata: Install wikibase using individual extensions .. wikidata: Install wikibase using individual extensions The wikidatabuild repo has been deprecated and is no longer being updated. Change install method to provision individual extensions as is now done in the Wikimedia production deployment. Bug: T181769 Bug: T183307 Co-Authored-By: Bryan Davis Change-Id: I3e90b08e518505b0af1b57dda73b4b690627 --- M puppet/modules/role/manifests/wikidata.pp M puppet/modules/role/templates/wikidata/init.php.erb M puppet/modules/role/templates/wikidata/shared.php.erb 3 files changed, 114 insertions(+), 51 deletions(-) Approvals: BryanDavis: Checked; Looks good to me, approved jenkins-bot: Verified diff --git a/puppet/modules/role/manifests/wikidata.pp b/puppet/modules/role/manifests/wikidata.pp index 9ef3ada..8bfcb87 100644 --- a/puppet/modules/role/manifests/wikidata.pp +++ b/puppet/modules/role/manifests/wikidata.pp @@ -12,7 +12,67 @@ include ::role::sitematrix include ::role::langwikis -mediawiki::wiki { 'wikidata': } +mediawiki::wiki { 'wikidata': +wgconf => { +'wmvExtensions' => { + 'ArticlePlaceholder' => false, +}, +}, +} + +# Bootstrapping settings +mediawiki::settings { 'WikiData-Init': +priority => $::load_early, +values => template('role/wikidata/init.php.erb'), +} + +# Note composer installing all of the extensions will run into duplicate +# libs being installed. The first one that is loaded will actually be +# used, in theory we could run into issues here but as long as each +# extension is checked out at the same time / to the same version there +# shouldnt be issues... + +# NOTE: there is always a wikibase_repo role, maybe we should use that? +mediawiki::extension { 'Wikibase': +composer => true, +needs_update => true, +settings => template('role/wikidata/shared.php.erb'), +} + +mediawiki::extension { 'Wikidata.org': +needs_update => true, +wiki => 'wikidata', +} + +mediawiki::extension { 'PropertySuggester': +needs_update => true, +wiki => 'wikidata', +} + +mediawiki::extension { 'WikibaseQuality': +needs_update => true, +wiki => 'wikidata', +} + +mediawiki::extension { 'WikibaseQualityConstraints': +needs_update => true, +wiki => 'wikidata', +} + +mediawiki::extension { 'WikimediaBadges': +needs_update => true, +} + +mediawiki::extension { 'ArticlePlaceholder': +needs_update => true, +} + +mediawiki::maintenance { 'wikidata-populate-site-tables': +command => "/usr/local/bin/foreachwikiwithextension Wikibase extensions/Wikibase/lib/maintenance/populateSitesTable.php --load-from http://en${mediawiki::multiwiki::base_domain}${::port_fragment}/w/api.php";, +refreshonly => true, +} + +Mediawiki::Wiki<| |> ~> Mediawiki::Maintenance['wikidata-populate-site-tables'] # TODO: Going to http://wikidata.wiki.local.wmftest.net:8080/ # will work, but if you explicitly visit Main_Page in the main @@ -31,32 +91,4 @@ wiki=> 'wikidata', db_name => 'wikidatawiki', } - -mediawiki::extension { 'WikidataBuildResources': -remote => 'https://gerrit.wikimedia.org/r/wikidata/build-resources', -entrypoint => 'Wikidata.php', -composer => true, -needs_update => true, -settings => template('role/wikidata/shared.php.erb'), -} - -mediawiki::settings { 'WikiData-Init': -priority => $::load_early, -values => template('role/wikidata/init.php.erb'), -} - -exec { 'wikidata-update-git-remote': -command => '/usr/bin/git remote set-url origin https://gerrit.wikimedia.org/r/wikidata/build-resources', -unless => "/usr/bin/git remote -v | grep -q 'https://gerrit.wikimedia.org/r/wikidata/build-resources'", -cwd => "${::mediawiki::dir}/extensions/WikidataBuildResources", -require => Mediawiki::Extension['WikidataBuildResources'], -} - -mediawiki::maintenance { 'wikidata-populate-site-tables': -command => "/usr/local/bin/foreachwikiwithextension WikidataBuildResources extensions/WikidataBuildResources/extensions/Wikibase/lib/maintenance/populateSitesTable.php --load-from http://en${mediawiki::multiwiki::base_domain}${::port_fragment}/w/api.php";, -refreshonly => true, -} - -Mediawiki::Wiki<| |> ~> Mediawiki::Maintenance['wikidata-populate-site-tables'] - } diff --git a/puppet/modules/role/templates/wikidata/init.php.erb b/puppet/modules/role/templates/wikidata/init.php.erb i
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: Mutate $wgServer after applying local settings
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/400204 ) Change subject: Mutate $wgServer after applying local settings .. Mutate $wgServer after applying local settings Move the block introduced in 8c7bf33 and updated in 990f03a which sets $wgServer relative to current request headers and trims the protocol if the deployment supports HTTP and HTTPS *after* the user and Puppet managed local settings files are processed. Bug: T183302 Change-Id: I381b9b1ea910c8b96cc4c4186e5f91ae64a5372c --- M puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb 1 file changed, 10 insertions(+), 9 deletions(-) Approvals: BryanDavis: Looks good to me, approved jenkins-bot: Verified diff --git a/puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb b/puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb index 6eaaa3c..3b61f12 100644 --- a/puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb +++ b/puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb @@ -54,15 +54,6 @@ ), ); -if ( PHP_SAPI !== 'cli' ) { - // T68399: set wgServer from inbound request - $wgServer = WebRequest::detectServer(); - if ( isset( $mwvSupportsHttps ) && $mwvSupportsHttps ) { - // Create protocol-relative URL when the HTTPS role is active - $wgServer = preg_replace( '#^https?:#', '', $wgServer ); - } -} - /** * @var array $wmvActiveExtensions List of extensions enabled for the wiki * Populated by settings.d files generated by ::mediawiki::extension and @@ -82,3 +73,13 @@ ) { include_once $conffile; } + +// T183302: Mutate $wgServer *after* local settings changes +if ( PHP_SAPI !== 'cli' ) { + // T68399: set wgServer from inbound request + $wgServer = WebRequest::detectServer(); + if ( isset( $mwvSupportsHttps ) && $mwvSupportsHttps ) { + // Create protocol-relative URL when the HTTPS role is active + $wgServer = preg_replace( '#^https?:#', '', $wgServer ); + } +} -- To view, visit https://gerrit.wikimedia.org/r/400204 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I381b9b1ea910c8b96cc4c4186e5f91ae64a5372c Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: stretch-migration Gerrit-Owner: BryanDavis Gerrit-Reviewer: BryanDavis Gerrit-Reviewer: Dduvall Gerrit-Reviewer: Gergő Tisza Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: vagrant: Add plugin to set host file permissions
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/400198 ) Change subject: vagrant: Add plugin to set host file permissions .. vagrant: Add plugin to set host file permissions Git does not have a means to version permissions on files other than the execute bit. The MediaWikiVagrant.FilePerms provisioner plugin lets us add manipulation of local file system permissions to a `vagrant {provision, up}` run. The initial use of this feature is making the cache/apt/partial directory world writable so that Stretch's _apt user can write downloaded files there. Bug: T183150 Change-Id: I8d0c7ed9f1d055fb5dbcebfb62cf72eac722f7e1 --- M Vagrantfile M lib/mediawiki-vagrant.rb A lib/mediawiki-vagrant/file_perms.rb 3 files changed, 21 insertions(+), 0 deletions(-) Approvals: BryanDavis: Looks good to me, approved jenkins-bot: Verified diff --git a/Vagrantfile b/Vagrantfile index b26a372..76881d4 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -214,6 +214,8 @@ config.vm.provision :mediawiki_reload if mwv.reload? + config.vm.provision :file_perms + # Ensure that the VM has Puppet installed config.vm.provision :shell, path: 'support/puppet-bootstrap.sh' diff --git a/lib/mediawiki-vagrant.rb b/lib/mediawiki-vagrant.rb index 0efaf69..ae1ebf2 100644 --- a/lib/mediawiki-vagrant.rb +++ b/lib/mediawiki-vagrant.rb @@ -109,5 +109,10 @@ LsbCheck::Provisioner end +provisioner :file_perms do + require 'mediawiki-vagrant/file_perms' + FilePerms +end + end end diff --git a/lib/mediawiki-vagrant/file_perms.rb b/lib/mediawiki-vagrant/file_perms.rb new file mode 100644 index 000..5a1c4c4 --- /dev/null +++ b/lib/mediawiki-vagrant/file_perms.rb @@ -0,0 +1,14 @@ +require 'fileutils' + +require 'mediawiki-vagrant/plugin_environment' + +module MediaWikiVagrant + class FilePerms < Vagrant.plugin('2', :provisioner) +include PluginEnvironment + +def configure(_root_config) + # T183150: Make cache/apt/partial world writable + FileUtils.chmod 'a=wrx', @mwv.path('cache/apt/partial') +end + end +end -- To view, visit https://gerrit.wikimedia.org/r/400198 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8d0c7ed9f1d055fb5dbcebfb62cf72eac722f7e1 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: stretch-migration Gerrit-Owner: BryanDavis Gerrit-Reviewer: BryanDavis Gerrit-Reviewer: Dduvall Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Added Progress Bar for download_dump.py
Ryan10145 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401199 ) Change subject: Added Progress Bar for download_dump.py .. Added Progress Bar for download_dump.py Bug: T183664 Change-Id: Iacfc4ffec3f7b928fa245879c154775a9f692b8a --- M scripts/maintenance/download_dump.py 1 file changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/99/401199/1 diff --git a/scripts/maintenance/download_dump.py b/scripts/maintenance/download_dump.py index 853d33f..a9985d1 100644 --- a/scripts/maintenance/download_dump.py +++ b/scripts/maintenance/download_dump.py @@ -119,8 +119,39 @@ response = fetch(url, stream=True) if response.status == 200: with open(file_current_storepath, 'wb') as result_file: +total = int(response.response_headers.get( +'content-length')) +downloaded = 0 +parts = 50 +B_IN_GB = 1073741824 +B_IN_MB = 1048576 + for data in response.data.iter_content(100 * 1024): result_file.write(data) + +if total is not None: +downloaded += len(data) +done = int(parts * downloaded / + total) +sys.stdout.write("\r|{0}{1}|".format( +'=' * done, '-' * (parts - done))) + +# Format the data size display with units +disp_total = ( +format(total / B_IN_MB, '.2f') + +'M', +format(total / B_IN_GB, '.2f') + +'G')[total > B_IN_GB] +disp_downloaded = ( +format(downloaded / B_IN_MB, '.2f') + +'M', +format(downloaded / B_IN_GB, '.2f') + +'G')[downloaded > B_IN_GB] + +sys.stdout.write('\t{0}/{1}'.format( +disp_downloaded, disp_total)) +sys.stdout.flush() +sys.stdout.write('\n') elif response.status == 404: pywikibot.output( 'File with name "{filename}", ' -- To view, visit https://gerrit.wikimedia.org/r/401199 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iacfc4ffec3f7b928fa245879c154775a9f692b8a Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ryan10145 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: public_dumps: Remove module path and rename to distribution
Madhuvishy has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401198 ) Change subject: public_dumps: Remove module path and rename to distribution .. public_dumps: Remove module path and rename to distribution Removing the module path for public_dumps since it should really be in the profile path. Also changing public to distribution, since public is a vague name, and we could end up with dumps generation and dumps distribution as 2 distinct roles. Bug: T171539 Change-Id: If03cf64f3f577f76914d0e0ab2d72a932340ba8f --- M manifests/site.pp R modules/profile/manifests/dumps/distribution/server.pp A modules/role/manifests/dumps/distribution/server.pp D modules/role/manifests/dumps/public/server.pp 4 files changed, 21 insertions(+), 17 deletions(-) Approvals: Madhuvishy: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/site.pp b/manifests/site.pp index df1b8a0..d90fb8a 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1248,7 +1248,7 @@ } node /labstore100[67]\.wikimedia\.org/ { -role(dumps::public::server) +role(dumps::distribution::server) } node /labstore200[1-2]\.codfw\.wmnet/ { diff --git a/modules/public_dumps/manifests/server.pp b/modules/profile/manifests/dumps/distribution/server.pp similarity index 66% rename from modules/public_dumps/manifests/server.pp rename to modules/profile/manifests/dumps/distribution/server.pp index 94e1429..a7d1edc 100644 --- a/modules/public_dumps/manifests/server.pp +++ b/modules/profile/manifests/dumps/distribution/server.pp @@ -1,5 +1,9 @@ -# Base class to set up a Public Dumps server -class public_dumps::server { +# Profile for Dumps distribution server in the Public VLAN, +# that serves dumps to Cloud VPS/Stat boxes via NFS, +# or via web or rsync to mirrors + +class profile::dumps::distribution::server { +class { '::dumpsuser': } file { '/srv/dumps': ensure => 'directory', diff --git a/modules/role/manifests/dumps/distribution/server.pp b/modules/role/manifests/dumps/distribution/server.pp new file mode 100644 index 000..250130c --- /dev/null +++ b/modules/role/manifests/dumps/distribution/server.pp @@ -0,0 +1,14 @@ +class role::dumps::distribution::server { +system::role { 'dumps::distribution::server': description => 'labstore host in the public VLAN that distributes Dumps to clients via NFS/Web/Rsync' } + +include ::standard +include ::profile::base::firewall +include ::profile::wmcs::nfs::ferm +include ::profile::dumps::distribution::server +include ::profile::dumps::web::rsync_server +include ::profile::dumps::rsyncer +include ::profile::dumps::web::dumpstatusfiles_sync +include ::profile::dumps::web::cleanup +include ::profile::dumps::web::cleanup_miscdatasets + +} diff --git a/modules/role/manifests/dumps/public/server.pp b/modules/role/manifests/dumps/public/server.pp deleted file mode 100644 index d20ae51..000 --- a/modules/role/manifests/dumps/public/server.pp +++ /dev/null @@ -1,14 +0,0 @@ -class role::dumps::public::server { -system::role { 'dumps::public::server': description => 'labstore host in the public VLAN that serves Dumps to clients via NFS/Web/Rsync' } - -include ::standard -include ::profile::base::firewall -include ::profile::wmcs::nfs::ferm -include ::profile::dumps::public_server -include ::profile::dumps::web::rsync_server -include ::profile::dumps::rsyncer -include ::profile::dumps::web::dumpstatusfiles_sync -include ::profile::dumps::web::cleanup -include ::profile::dumps::web::cleanup_miscdatasets - -} -- To view, visit https://gerrit.wikimedia.org/r/401198 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If03cf64f3f577f76914d0e0ab2d72a932340ba8f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Madhuvishy Gerrit-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] operations/puppet[production]: public_dumps: Remove module path and rename to distribution
Madhuvishy has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401198 ) Change subject: public_dumps: Remove module path and rename to distribution .. public_dumps: Remove module path and rename to distribution Removing the module path for public_dumps since it should really be in the profile path. Also changing public to distribution, since public is a vague name, and we could end up with dumps generation and dumps distribution as 2 distinct roles. Bug: T171539 Change-Id: If03cf64f3f577f76914d0e0ab2d72a932340ba8f --- M manifests/site.pp R modules/profile/manifests/dumps/distribution/server.pp A modules/role/manifests/dumps/distribution/server.pp D modules/role/manifests/dumps/public/server.pp 4 files changed, 21 insertions(+), 17 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/98/401198/1 diff --git a/manifests/site.pp b/manifests/site.pp index df1b8a0..d90fb8a 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1248,7 +1248,7 @@ } node /labstore100[67]\.wikimedia\.org/ { -role(dumps::public::server) +role(dumps::distribution::server) } node /labstore200[1-2]\.codfw\.wmnet/ { diff --git a/modules/public_dumps/manifests/server.pp b/modules/profile/manifests/dumps/distribution/server.pp similarity index 66% rename from modules/public_dumps/manifests/server.pp rename to modules/profile/manifests/dumps/distribution/server.pp index 94e1429..a7d1edc 100644 --- a/modules/public_dumps/manifests/server.pp +++ b/modules/profile/manifests/dumps/distribution/server.pp @@ -1,5 +1,9 @@ -# Base class to set up a Public Dumps server -class public_dumps::server { +# Profile for Dumps distribution server in the Public VLAN, +# that serves dumps to Cloud VPS/Stat boxes via NFS, +# or via web or rsync to mirrors + +class profile::dumps::distribution::server { +class { '::dumpsuser': } file { '/srv/dumps': ensure => 'directory', diff --git a/modules/role/manifests/dumps/distribution/server.pp b/modules/role/manifests/dumps/distribution/server.pp new file mode 100644 index 000..250130c --- /dev/null +++ b/modules/role/manifests/dumps/distribution/server.pp @@ -0,0 +1,14 @@ +class role::dumps::distribution::server { +system::role { 'dumps::distribution::server': description => 'labstore host in the public VLAN that distributes Dumps to clients via NFS/Web/Rsync' } + +include ::standard +include ::profile::base::firewall +include ::profile::wmcs::nfs::ferm +include ::profile::dumps::distribution::server +include ::profile::dumps::web::rsync_server +include ::profile::dumps::rsyncer +include ::profile::dumps::web::dumpstatusfiles_sync +include ::profile::dumps::web::cleanup +include ::profile::dumps::web::cleanup_miscdatasets + +} diff --git a/modules/role/manifests/dumps/public/server.pp b/modules/role/manifests/dumps/public/server.pp deleted file mode 100644 index d20ae51..000 --- a/modules/role/manifests/dumps/public/server.pp +++ /dev/null @@ -1,14 +0,0 @@ -class role::dumps::public::server { -system::role { 'dumps::public::server': description => 'labstore host in the public VLAN that serves Dumps to clients via NFS/Web/Rsync' } - -include ::standard -include ::profile::base::firewall -include ::profile::wmcs::nfs::ferm -include ::profile::dumps::public_server -include ::profile::dumps::web::rsync_server -include ::profile::dumps::rsyncer -include ::profile::dumps::web::dumpstatusfiles_sync -include ::profile::dumps::web::cleanup -include ::profile::dumps::web::cleanup_miscdatasets - -} -- To view, visit https://gerrit.wikimedia.org/r/401198 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If03cf64f3f577f76914d0e0ab2d72a932340ba8f 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] mediawiki/core[master]: Add tests for ApiCheckToken
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401192 ) Change subject: Add tests for ApiCheckToken .. Add tests for ApiCheckToken Bug: T183768 Change-Id: I63ab0413252c7333f73b881995869454c4881a57 --- A tests/phpunit/includes/api/ApiCheckTokenTest.php 1 file changed, 95 insertions(+), 0 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/phpunit/includes/api/ApiCheckTokenTest.php b/tests/phpunit/includes/api/ApiCheckTokenTest.php new file mode 100644 index 000..f1d95d0 --- /dev/null +++ b/tests/phpunit/includes/api/ApiCheckTokenTest.php @@ -0,0 +1,95 @@ +doApiRequest( [ + 'action' => 'query', + 'meta' => 'tokens', + ] ); + + $data = $this->doApiRequest( [ + 'action' => 'checktoken', + 'type' => 'csrf', + 'token' => $tokens[0]['query']['tokens']['csrftoken'], + ], $tokens[1]->getSessionArray() ); + + $this->assertEquals( 'valid', $data[0]['checktoken']['result'] ); + $this->assertArrayHasKey( 'generated', $data[0]['checktoken'] ); + } + + /** +* Test result of checking invalid token +*/ + public function testCheckTokenInvalid() { + $session = []; + $data = $this->doApiRequest( [ + 'action' => 'checktoken', + 'type' => 'csrf', + 'token' => 'invalid_token', + ], $session ); + + $this->assertEquals( 'invalid', $data[0]['checktoken']['result'] ); + } + + /** +* Test result of checking token with negative max age (should be expired) +*/ + public function testCheckTokenExpired() { + // Query token which will be checked later + $tokens = $this->doApiRequest( [ + 'action' => 'query', + 'meta' => 'tokens', + ] ); + + $data = $this->doApiRequest( [ + 'action' => 'checktoken', + 'type' => 'csrf', + 'token' => $tokens[0]['query']['tokens']['csrftoken'], + 'maxtokenage' => -1, + ], $tokens[1]->getSessionArray() ); + + $this->assertEquals( 'expired', $data[0]['checktoken']['result'] ); + $this->assertArrayHasKey( 'generated', $data[0]['checktoken'] ); + } + + /** +* Test if using token with incorrect suffix will produce a warning +*/ + public function testCheckTokenSuffixWarning() { + // Query token which will be checked later + $tokens = $this->doApiRequest( [ + 'action' => 'query', + 'meta' => 'tokens', + ] ); + + // Get token and change the suffix + $token = $tokens[0]['query']['tokens']['csrftoken']; + $token = substr( $token, 0, -strlen( Token::SUFFIX ) ) . urldecode( Token::SUFFIX ); + + $data = $this->doApiRequest( [ + 'action' => 'checktoken', + 'type' => 'csrf', + 'token' => $token, + 'errorformat' => 'raw', + ], $tokens[1]->getSessionArray() ); + + $this->assertEquals( 'invalid', $data[0]['checktoken']['result'] ); + $this->assertArrayHasKey( 'warnings', $data[0] ); + $this->assertCount( 1, $data[0]['warnings'] ); + $this->assertEquals( 'checktoken', $data[0]['warnings'][0]['module'] ); + $this->assertEquals( 'checktoken-percentencoding', $data[0]['warnings'][0]['code'] ); + } + +} -- To view, visit https://gerrit.wikimedia.org/r/401192 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I63ab0413252c7333f73b881995869454c4881a57 Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Phantom42 Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Phantom42 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...GoogleLogin[master]: Use PSR-4 autoloader of extension registration for class loa...
Florianschmidtwelzow has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401197 ) Change subject: Use PSR-4 autoloader of extension registration for class loading .. Use PSR-4 autoloader of extension registration for class loading This became available in MediaWiki 1.31 and removes the requirement of maintaining a class names to file map in extension.json, as long as the classes are placed according to their name and namespace. Change-Id: I1a50eb8e24e7253ad31b7e0962186707431ddf6e --- M extension.json R includes/AllowedDomains/AllowedDomainsStore.php R includes/AllowedDomains/ArrayAllowedDomainsStore.php R includes/AllowedDomains/CachedAllowedDomainsStore.php R includes/AllowedDomains/DBAllowedDomainsStore.php R includes/AllowedDomains/EmailDomain.php R includes/AllowedDomains/MutableAllowedDomainsStore.php R includes/Api/ApiGoogleLoginInfo.php R includes/Api/ApiGoogleLoginManageAllowedDomains.php R includes/Auth/GoogleAuthenticationRequest.php R includes/Auth/GooglePrimaryAuthenticationProvider.php R includes/Auth/GoogleRemoveAuthenticationRequest.php R includes/Auth/GoogleServerAuthenticationRequest.php R includes/Auth/GoogleUserInfoAuthenticationRequest.php M includes/Constants.php M includes/EchoGoogleLoginPresentationModel.php R includes/GoogleLogin.php R includes/GoogleLoginHooks.php R includes/HtmlForm/HTMLGoogleLoginButtonField.php R includes/Specials/SpecialGoogleLogin.php R includes/Specials/SpecialGoogleLoginAllowedDomains.php R includes/Specials/SpecialGoogleLoginReturn.php R includes/Specials/SpecialManageGoogleLogin.php 23 files changed, 13 insertions(+), 34 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GoogleLogin refs/changes/97/401197/1 diff --git a/extension.json b/extension.json index f23cbdd..c1a6ddb 100644 --- a/extension.json +++ b/extension.json @@ -12,7 +12,7 @@ } }, "requires": { - "MediaWiki": ">= 1.28.0" + "MediaWiki": ">= 1.31.0" }, "AvailableRights": [ "managegooglelogin", @@ -32,7 +32,7 @@ "echo-subscriptions-email-change-googlelogin": true }, "APIModules": { - "googleplusprofileinfo": "ApiGoogleLoginInfo", + "googleplusprofileinfo": "GoogleLogin\\Api\\ApiGoogleLoginInfo", "googleloginmanagealloweddomain": "GoogleLogin\\Api\\ApiGoogleLoginManageAllowedDomains" }, "MessagesDirs": { @@ -43,30 +43,8 @@ "ExtensionMessagesFiles": { "GoogleLoginAlias": "GoogleLogin.alias.php" }, - "AutoloadClasses": { - "GoogleLogin\\GoogleLogin": "includes/GoogleLogin.body.php", - "GoogleLogin\\EchoGoogleLoginPresentationModel": "includes/EchoGoogleLoginPresentationModel.php", - "GoogleLogin\\HTMLGoogleLoginButtonField": "includes/htmlform/HTMLGoogleLoginButtonField.php", - "GoogleLogin\\Specials\\SpecialGoogleLogin": "includes/specials/SpecialGoogleLogin.php", - "GoogleLogin\\Specials\\SpecialGoogleLoginReturn": "includes/specials/SpecialGoogleLoginReturn.php", - "GoogleLogin\\Specials\\SpecialManageGoogleLogin": "includes/specials/SpecialManageGoogleLogin.php", - "GoogleLogin\\Specials\\SpecialGoogleLoginAllowedDomains": "includes/specials/SpecialGoogleLoginAllowedDomains.php", - "GoogleLogin\\GoogleLoginHooks": "includes/GoogleLogin.hooks.php", - "GoogleLogin\\GoogleUser": "includes/GoogleUser.php", - "GoogleLogin\\Constants": "includes/Constants.php", - "GoogleLogin\\Auth\\GooglePrimaryAuthenticationProvider": "includes/auth/GooglePrimaryAuthenticationProvider.php", - "GoogleLogin\\Auth\\GoogleServerAuthenticationRequest": "includes/auth/GoogleServerAuthenticationRequest.php", - "GoogleLogin\\Auth\\GoogleAuthenticationRequest": "includes/auth/GoogleAuthenticationRequest.php", - "GoogleLogin\\Auth\\GoogleRemoveAuthenticationRequest": "includes/auth/GoogleRemoveAuthenticationRequest.php", - "GoogleLogin\\Auth\\GoogleUserInfoAuthenticationRequest": "includes/auth/GoogleUserInfoAuthenticationRequest.php", - "GoogleLogin\\AllowedDomains\\AllowedDomainsStore": "includes/alloweddomains/AllowedDomainsStore.php", - "GoogleLogin\\AllowedDomains\\MutableAllowedDomainsStore": "includes/alloweddomains/MutableAllowedDomainsStore.php", - "GoogleLogin\\AllowedDomains\\ArrayAllowedDomainsStore": "includes/alloweddomains/ArrayAllowedDomainsStore.php", - "GoogleLogin\\AllowedDomains\\DBAllowedDomainsStore": "includes/alloweddomains/DBAllowedDomainsStore.php", - "GoogleLogin\\AllowedDomains\\CachedAllowedDomainsStore": "includes/alloweddomains/CachedAllowedDomainsStore.php", -
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401102 ) Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0 .. build: Updating mediawiki/mediawiki-codesniffer to 15.0.0 Change-Id: I515dc1003bd5ee2352c85ac49e19f54e7036bd5d --- M ApiVisualEditor.php M composer.json M modules/ve-mw-collab/SpecialCollabPad.php 3 files changed, 6 insertions(+), 7 deletions(-) Approvals: Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php index 3878598..dd94163 100644 --- a/ApiVisualEditor.php +++ b/ApiVisualEditor.php @@ -672,9 +672,8 @@ ExtensionRegistry::getInstance()->getAttribute( 'VisualEditorAvailableContentModels' ), $config->get( 'VisualEditorAvailableContentModels' ) ); - return - isset( $availableContentModels[ $contentModel ] ) && - $availableContentModels[ $contentModel ]; + return isset( $availableContentModels[$contentModel] ) && + $availableContentModels[$contentModel]; } /** diff --git a/composer.json b/composer.json index 78b5e96..7f42a6e 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", "jakub-onderka/php-console-highlighter": "0.3.2", - "mediawiki/mediawiki-codesniffer": "14.1.0", + "mediawiki/mediawiki-codesniffer": "15.0.0", "mediawiki/minus-x": "0.2.1" }, "scripts": { diff --git a/modules/ve-mw-collab/SpecialCollabPad.php b/modules/ve-mw-collab/SpecialCollabPad.php index 14ad803..06d14af 100644 --- a/modules/ve-mw-collab/SpecialCollabPad.php +++ b/modules/ve-mw-collab/SpecialCollabPad.php @@ -12,7 +12,7 @@ */ private $output = null; - function __construct() { + public function __construct() { parent::__construct( 'CollabPad' ); } @@ -25,12 +25,12 @@ return !!$wgVisualEditorRebaserURL && parent::userCanExecute( $user ); } - function isListed() { + protected function isListed() { global $wgVisualEditorRebaserURL; return !!$wgVisualEditorRebaserURL; } - function execute( $par ) { + public function execute( $par ) { $this->setHeaders(); $this->checkPermissions(); -- To view, visit https://gerrit.wikimedia.org/r/401102 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I515dc1003bd5ee2352c85ac49e19f54e7036bd5d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Umherirrender 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...TweetANew[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/400947 ) Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0 .. build: Updating mediawiki/mediawiki-codesniffer to 15.0.0 The following sniffs now pass and were enabled: * Generic.Arrays.DisallowLongArraySyntax.Found * Generic.ControlStructures.InlineControlStructure.NotAllowed * Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma * Generic.PHP.NoSilencedErrors.Discouraged * Generic.WhiteSpace.DisallowSpaceIndent.SpacesUsed * MediaWiki.AlternativeSyntax.AlternativeSyntax.AlternativeSyntax * MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic * MediaWiki.Commenting.FunctionComment.MissingParamComment * MediaWiki.Commenting.FunctionComment.MissingReturn * MediaWiki.Commenting.FunctionComment.NotShortBoolParam * MediaWiki.Commenting.FunctionComment.ParamNameNoMatch * MediaWiki.Commenting.FunctionComment.SpacingBeforeParamType * MediaWiki.ControlStructures.IfElseStructure.SpaceAfterElse * MediaWiki.ControlStructures.IfElseStructure.SpaceBeforeElse * MediaWiki.WhiteSpace.DisallowEmptyLineFunctions.NoEmptyLine * MediaWiki.WhiteSpace.SpaceyParenthesis.SingleSpaceAfterOpenParenthesis * MediaWiki.WhiteSpace.SpaceyParenthesis.SingleSpaceBeforeCloseParenthesis * PSR2.Classes.PropertyDeclaration.Underscore * Squiz.Classes.ValidClassName.NotCamelCaps * Squiz.Operators.ValidLogicalOperators.NotAllowed Change-Id: Ibc4e64b5cdd5ab6b3e23aae25692cdcef768d263 --- M .phpcs.xml M TweetANew.body.php M TweetANew.php M composer.json 4 files changed, 38 insertions(+), 58 deletions(-) Approvals: Albert221: Looks good to me, but someone else must approve Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/.phpcs.xml b/.phpcs.xml index 8240861..25901c7 100644 --- a/.phpcs.xml +++ b/.phpcs.xml @@ -1,32 +1,12 @@ - - - - - - - - - - - - - - - - - - - - . diff --git a/TweetANew.body.php b/TweetANew.body.php index 3e00b2f..1ac1358 100644 --- a/TweetANew.body.php +++ b/TweetANew.body.php @@ -51,13 +51,13 @@ # Parse random text $tweet_text = wfMessage( 'tweetanew-new' . $switcher, - array( $wikiPage->getTitle()->getText(), $finalurl ) + [ $wikiPage->getTitle()->getText(), $finalurl ] )->text(); } else { # Use default tweet message format $tweet_body = wfMessage( 'tweetanew-newdefault', - array( $wikiPage->getTitle()->getText(), $finalurl ) + [ $wikiPage->getTitle()->getText(), $finalurl ] )->text(); $tweet_text = $tweet_body; } @@ -122,12 +122,12 @@ $dbr = wfGetDB( DB_REPLICA ); $res = $dbr->select( 'revision', - array( 'rev_timestamp' ), - array( 'rev_page' => $wikiPage->getId() ), + [ 'rev_timestamp' ], + [ 'rev_page' => $wikiPage->getId() ], __METHOD__, - array( 'ORDER BY' => 'rev_id DESC', 'LIMIT' => '2' ) + [ 'ORDER BY' => 'rev_id DESC', 'LIMIT' => '2' ] ); - $edittime = array(); + $edittime = []; foreach ( $res as $row ) { $edittime[] = $row->rev_timestamp; } @@ -181,13 +181,13 @@ # Parse random text $tweet_text .= RequestContext::getMain()->msg( 'tweetanew-edit' . $switcher, - array( $wikiPage->getTitle()->getText(), $finalurl ) + [ $wikiPage->getTitle()->getText(), $finalurl ] )->text(); } else { # Use default tweet message format
[MediaWiki-commits] [Gerrit] analytics...WDCM-ShinyServerFrontPage[master]: minor Jan 1 2018
GoranSMilovanovic has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401196 ) Change subject: minor Jan 1 2018 .. minor Jan 1 2018 Change-Id: Ib62f02d297d4dfe361033d5d4c58689ed0507689 --- A GeoDashboard.png M Wikidata-logo-en.png M index.html M wikitech.png 4 files changed, 12 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/wmde/WDCM-ShinyServerFrontPage refs/changes/96/401196/1 diff --git a/GeoDashboard.png b/GeoDashboard.png new file mode 100644 index 000..eda2535 --- /dev/null +++ b/GeoDashboard.png Binary files differ diff --git a/Wikidata-logo-en.png b/Wikidata-logo-en.png index 5e52bba..eee7383 100644 --- a/Wikidata-logo-en.png +++ b/Wikidata-logo-en.png Binary files differ diff --git a/index.html b/index.html index 627138d..a20e0d9 100644 --- a/index.html +++ b/index.html @@ -266,13 +266,22 @@ +http://wdcm.wmflabs.org/WDCM_GeoDashboard/";>WDCM Geo + http://wdcm.wmflabs.org/WDCM_GeoDashboard/";> + + +The Geo Dashboard provides interactive Leaflet maps of Wikidata items and their usage statistics. + + + + https://wikitech.wikimedia.org/wiki/Wikidata_Concepts_Monitor";>WDCM on Wikitech - https://wikitech.wikimedia.org/wiki/Wikidata_Concepts_Monitor";> + https://wikitech.wikimedia.org/wiki/Wikidata_Concepts_Monitor";> -https://www.wikidata.org/wiki/Q42376073";>WDCM on Wikidata - https://www.wikidata.org/wiki/Q42376073"; target = "blank"> +https://www.wikidata.org/wiki/Wikidata:Wikidata_Concepts_Monitor";>WDCM on Wikidata + https://www.wikidata.org/wiki/Wikidata:Wikidata_Concepts_Monitor"; target = "blank"> diff --git a/wikitech.png b/wikitech.png index 2cee20d..8d2be7e 100644 --- a/wikitech.png +++ b/wikitech.png Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/401196 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib62f02d297d4dfe361033d5d4c58689ed0507689 Gerrit-PatchSet: 1 Gerrit-Project: analytics/wmde/WDCM-ShinyServerFrontPage Gerrit-Branch: master Gerrit-Owner: GoranSMilovanovic ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics...WDCM-ShinyServerFrontPage[master]: minor Jan 1 2018
GoranSMilovanovic has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401196 ) Change subject: minor Jan 1 2018 .. minor Jan 1 2018 Change-Id: Ib62f02d297d4dfe361033d5d4c58689ed0507689 --- A GeoDashboard.png M Wikidata-logo-en.png M index.html M wikitech.png 4 files changed, 12 insertions(+), 3 deletions(-) Approvals: GoranSMilovanovic: Looks good to me, approved jenkins-bot: Verified diff --git a/GeoDashboard.png b/GeoDashboard.png new file mode 100644 index 000..eda2535 --- /dev/null +++ b/GeoDashboard.png Binary files differ diff --git a/Wikidata-logo-en.png b/Wikidata-logo-en.png index 5e52bba..eee7383 100644 --- a/Wikidata-logo-en.png +++ b/Wikidata-logo-en.png Binary files differ diff --git a/index.html b/index.html index 627138d..a20e0d9 100644 --- a/index.html +++ b/index.html @@ -266,13 +266,22 @@ +http://wdcm.wmflabs.org/WDCM_GeoDashboard/";>WDCM Geo + http://wdcm.wmflabs.org/WDCM_GeoDashboard/";> + + +The Geo Dashboard provides interactive Leaflet maps of Wikidata items and their usage statistics. + + + + https://wikitech.wikimedia.org/wiki/Wikidata_Concepts_Monitor";>WDCM on Wikitech - https://wikitech.wikimedia.org/wiki/Wikidata_Concepts_Monitor";> + https://wikitech.wikimedia.org/wiki/Wikidata_Concepts_Monitor";> -https://www.wikidata.org/wiki/Q42376073";>WDCM on Wikidata - https://www.wikidata.org/wiki/Q42376073"; target = "blank"> +https://www.wikidata.org/wiki/Wikidata:Wikidata_Concepts_Monitor";>WDCM on Wikidata + https://www.wikidata.org/wiki/Wikidata:Wikidata_Concepts_Monitor"; target = "blank"> diff --git a/wikitech.png b/wikitech.png index 2cee20d..8d2be7e 100644 --- a/wikitech.png +++ b/wikitech.png Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/401196 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib62f02d297d4dfe361033d5d4c58689ed0507689 Gerrit-PatchSet: 1 Gerrit-Project: analytics/wmde/WDCM-ShinyServerFrontPage Gerrit-Branch: master Gerrit-Owner: GoranSMilovanovic Gerrit-Reviewer: GoranSMilovanovic Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401104 ) Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0 .. build: Updating mediawiki/mediawiki-codesniffer to 15.0.0 Change-Id: Ia6a7cb062c782f11b1b10cdb6302f9ed378ab8eb --- M .phpcs.xml M composer.json 2 files changed, 3 insertions(+), 2 deletions(-) Approvals: Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/.phpcs.xml b/.phpcs.xml index 76446a7..4764e29 100644 --- a/.phpcs.xml +++ b/.phpcs.xml @@ -3,7 +3,7 @@ - + @@ -14,6 +14,7 @@ + diff --git a/composer.json b/composer.json index a3f054b..000caa0 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,7 @@ "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", "jakub-onderka/php-console-highlighter": "0.3.2", - "mediawiki/mediawiki-codesniffer": "14.1.0", + "mediawiki/mediawiki-codesniffer": "15.0.0", "mediawiki/minus-x": "0.2.1" }, "scripts": { -- To view, visit https://gerrit.wikimedia.org/r/401104 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia6a7cb062c782f11b1b10cdb6302f9ed378ab8eb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageForms Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MultimediaViewer[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401105 ) Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0 .. build: Updating mediawiki/mediawiki-codesniffer to 15.0.0 Change-Id: I801c7f79af38f5ecf4e1ed07841386e9fab36f6b --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 6c45e79..f3cbcc4 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", "jakub-onderka/php-console-highlighter": "0.3.2", - "mediawiki/mediawiki-codesniffer": "14.1.0", + "mediawiki/mediawiki-codesniffer": "15.0.0", "mediawiki/minus-x": "0.2.1" }, "scripts": { -- To view, visit https://gerrit.wikimedia.org/r/401105 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I801c7f79af38f5ecf4e1ed07841386e9fab36f6b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MultimediaViewer Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Umherirrender 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...FileAnnotations[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401106 ) Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0 .. build: Updating mediawiki/mediawiki-codesniffer to 15.0.0 Change-Id: Ib373e3c21dde5f04b758f79f7a2018d67537e36a --- M ApiFileAnnotations.php M composer.json M includes/FileAnnotationsContent.php 3 files changed, 9 insertions(+), 10 deletions(-) Approvals: Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/ApiFileAnnotations.php b/ApiFileAnnotations.php index b67b83b..8318239 100644 --- a/ApiFileAnnotations.php +++ b/ApiFileAnnotations.php @@ -418,12 +418,11 @@ $page = $pages[0]; // There's only one page. Add HTML here. $info = $page['imageinfo'][0]; - return - '' . - '' . - '' . - '' . - ''; + return '' . + '' . + '' . + '' . + ''; } // Oops, there's no image. Bail. diff --git a/composer.json b/composer.json index df9b39a..5e6bd27 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "14.1.0", + "mediawiki/mediawiki-codesniffer": "15.0.0", "jakub-onderka/php-console-highlighter": "0.3.2", "mediawiki/minus-x": "0.2.0" }, diff --git a/includes/FileAnnotationsContent.php b/includes/FileAnnotationsContent.php index 7edd239..10cc5e1 100644 --- a/includes/FileAnnotationsContent.php +++ b/includes/FileAnnotationsContent.php @@ -20,11 +20,11 @@ * Represents file annotations for a file. */ class FileAnnotationsContent extends JsonContent { - function __construct( $text ) { + public function __construct( $text ) { parent::__construct( $text, 'FileAnnotations' ); } - function validate() { + public function validate() { $annotationsStatus = $this->getData(); $annotations = $annotationsStatus->getValue(); @@ -49,7 +49,7 @@ return EventLogging::schemaValidate( $arrayAnnotations, $schema ); } - function isValid() { + public function isValid() { try { return parent::isValid() && $this->validate(); } catch ( JsonSchemaException $e ) { -- To view, visit https://gerrit.wikimedia.org/r/401106 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib373e3c21dde5f04b758f79f7a2018d67537e36a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/FileAnnotations Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Umherirrender 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...cldr[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401107 ) Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0 .. build: Updating mediawiki/mediawiki-codesniffer to 15.0.0 Change-Id: I3d954b80cf3b3196454ebc6cd7def2dcec1b44f2 --- M .phpcs.xml M composer.json M rebuild.php 3 files changed, 16 insertions(+), 12 deletions(-) Approvals: Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/.phpcs.xml b/.phpcs.xml index a181996..52ddae2 100644 --- a/.phpcs.xml +++ b/.phpcs.xml @@ -3,11 +3,16 @@ - + + + + + + . diff --git a/composer.json b/composer.json index 94edc26..50eda74 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ }, "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "14.1.0", + "mediawiki/mediawiki-codesniffer": "15.0.0", "jakub-onderka/php-console-highlighter": "0.3.2", "mediawiki/minus-x": "0.2.1" }, diff --git a/rebuild.php b/rebuild.php index 784cfaa..0c59612 100644 --- a/rebuild.php +++ b/rebuild.php @@ -462,29 +462,28 @@ * @param string $code * @return string */ -// @codingStandardsIgnoreStart function getRealCode( $code ) { $realCode = $code; - if ( !strcmp( $code, 'kk' ) ) + if ( !strcmp( $code, 'kk' ) ) { $realCode = 'kk-cyrl'; - elseif ( !strcmp( $code, 'ku' ) ) + } elseif ( !strcmp( $code, 'ku' ) ) { $realCode = 'ku-arab'; - elseif ( !strcmp( $code, 'sr' ) ) + } elseif ( !strcmp( $code, 'sr' ) ) { $realCode = 'sr-ec'; - elseif ( !strcmp( $code, 'tg' ) ) + } elseif ( !strcmp( $code, 'tg' ) ) { $realCode = 'tg-cyrl'; - elseif ( !strcmp( $code, 'zh' ) ) + } elseif ( !strcmp( $code, 'zh' ) ) { $realCode = 'zh-hans'; - elseif ( !strcmp( $code, 'pt' ) ) + } elseif ( !strcmp( $code, 'pt' ) ) { $realCode = 'pt-br'; - elseif ( !strcmp( $code, 'pt-pt' ) ) + } elseif ( !strcmp( $code, 'pt-pt' ) ) { $realCode = 'pt'; - elseif ( !strcmp( $code, 'az-arab' ) ) + } elseif ( !strcmp( $code, 'az-arab' ) ) { $realCode = 'azb'; + } return $realCode; } -// @codingStandardsIgnoreEnd $maintClass = 'CLDRRebuild'; require_once RUN_MAINTENANCE_IF_MAIN; -- To view, visit https://gerrit.wikimedia.org/r/401107 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3d954b80cf3b3196454ebc6cd7def2dcec1b44f2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/cldr Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Umherirrender 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...SocialProfile[master]: UserBoard i18n: Fix phrasing of Echo notification bundle mes...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401195 ) Change subject: UserBoard i18n: Fix phrasing of Echo notification bundle message .. UserBoard i18n: Fix phrasing of Echo notification bundle message This message has been phrased incorrectly, as it wrongly assumes that each message is sent by a different person. The easiest way to "fix" this error is to rephrase this message. - New: "{{PLURAL:$1|One message|$1 messages|100=99+ messages}} have been left on your user board." - Original: "{{PLURAL:$1|One person|$1 people|100=99+ people}} left messages on your user board." Steps to reproduce: 1. Install the Echo extension on your local test wiki 2. Sign into one of your accounts and send multiple messages (e.g 3) to another account of yours 3. Sign into your other account and visit [[Special:Notifications]], and receive this wrongly phrased message. Change-Id: Idcdeacf73a1479b7dbb0146736e0f3e72b81041f --- M UserBoard/i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jack Phoenix: Looks good to me, approved jenkins-bot: Verified diff --git a/UserBoard/i18n/en.json b/UserBoard/i18n/en.json index 8cde24f..6529a17 100644 --- a/UserBoard/i18n/en.json +++ b/UserBoard/i18n/en.json @@ -58,7 +58,7 @@ "echo-category-title-social-msg": "User board messages", "echo-pref-tooltip-social-msg": "Notify me when someone leaves a message on my user board.", "notification-social-msg-send": "$1 just left a message on your user board.''$2''", - "notification-social-msg-send-bundle": "{{PLURAL:$1|One person|$1 people|100=99+ people}} left messages on your user board.", + "notification-social-msg-send-bundle": "{{PLURAL:$1|One message|$1 messages|100=99+ messages}} have been left on your user board.", "apihelp-socialprofile-send-message-description": "Send a message to a user's UserBoard.", "apihelp-socialprofile-send-message-summary": "Send a message to a user's UserBoard.", "apihelp-socialprofile-send-message-param-username": "The recipient's user name.", -- To view, visit https://gerrit.wikimedia.org/r/401195 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idcdeacf73a1479b7dbb0146736e0f3e72b81041f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SocialProfile Gerrit-Branch: master Gerrit-Owner: SamanthaNguyen Gerrit-Reviewer: Jack Phoenix Gerrit-Reviewer: Lewis Cawte Gerrit-Reviewer: Siebrand Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MultiLanguageManager[master]: Use MediaWiki PSR-4 autoloader
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401176 ) Change subject: Use MediaWiki PSR-4 autoloader .. Use MediaWiki PSR-4 autoloader Move from composer autoload to MediaWiki autoload will fix tests, because the no-composer tests are running on this extension Change-Id: I7baa533da64fcb7d91e362a1c57c0e31365a899b --- M composer.json M extension.json 2 files changed, 7 insertions(+), 7 deletions(-) Approvals: Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 4fefbef..6197711 100644 --- a/composer.json +++ b/composer.json @@ -5,12 +5,6 @@ "require": { "composer/installers": "~1.0" }, - "autoload": { - "psr-4": { - "MultiLanguageManager\\Tests\\": "tests/phpunit", - "MultiLanguageManager\\": "src" - } - }, "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", "jakub-onderka/php-console-highlighter": "0.3.2", diff --git a/extension.json b/extension.json index e290295..6b8510f 100644 --- a/extension.json +++ b/extension.json @@ -10,6 +10,9 @@ "descriptionmsg": "mlm-desc", "license-name": "GPL-2.0", "type": "other", + "requires": { + "MediaWiki": ">= 1.31.0" + }, "MessagesDirs": { "MultiLanguageManager": [ "i18n" @@ -101,6 +104,9 @@ "value": "MultiLanguageManager" } }, - "load_composer_autoloader" : true, + "AutoloadNamespaces": { + "MultiLanguageManager\\Tests\\": "tests/phpunit/", + "MultiLanguageManager\\": "src/" + }, "manifest_version": 2 } -- To view, visit https://gerrit.wikimedia.org/r/401176 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7baa533da64fcb7d91e362a1c57c0e31365a899b Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/MultiLanguageManager Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Umherirrender 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...Form[master]: Add missing qqq message documentation
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401175 ) Change subject: Add missing qqq message documentation .. Add missing qqq message documentation Enable banana checker Change-Id: I13008d3f1848150110916b3a110aff73dca66387 --- M Gruntfile.js M i18n/qqq.json 2 files changed, 24 insertions(+), 6 deletions(-) Approvals: Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/Gruntfile.js b/Gruntfile.js index 47d544d..ea67e84 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,10 +1,10 @@ module.exports = function ( grunt ) { grunt.loadNpmTasks( 'grunt-jsonlint' ); -// grunt.loadNpmTasks( 'grunt-banana-checker' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); -// var conf = grunt.file.readJSON( 'extension.json' ); + var conf = grunt.file.readJSON( 'extension.json' ); grunt.initConfig( { -// banana: conf.MessagesDirs, + banana: conf.MessagesDirs, jsonlint: { all: [ '**/*.json', @@ -14,6 +14,6 @@ } } ); - grunt.registerTask( 'test', [ 'jsonlint'/*, 'banana'*/ ] ); + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); grunt.registerTask( 'default', 'test' ); }; diff --git a/i18n/qqq.json b/i18n/qqq.json index 0bc5e13..eeac5dc 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -8,8 +8,26 @@ "The Evil IP address" ] }, - "form-desc": "{{desc}}", + "form-desc": "{{desc|name=Form|url=https://www.mediawiki.org/wiki/Extension:Form}}";, + "form": "{{doc-special}}", + "form-captcha-error": "An error message", + "form-pick-form": "A description message", + "form-no-name": "Used as page title", + "form-no-name-text": "An error message", + "form-bad-name": "Used as page title", + "form-bad-name-text": "An error message", "form-pattern": "The pattern of page names of form definitions. $1 is a given name for a form definition.", + "form-template-pattern": "{{notranslate}}", + "form-title-pattern": "Used as default title for an empty form", "form-save": "{{Identical|Save}}", - "form-required-field-error": "* $1 is a comma separated list of missing fields\n* $2 is the number of missing fields" + "form-index-mismatch-title": "Used as page title", + "form-index-mismatch": "An error message", + "form-article-exists": "Used as page title", + "form-article-existstext": "form-article-exists", + "form-bad-page-name": "Used as page title", + "form-bad-page-name-text": "An error message", + "form-required-field-error": "An error message\n* $1 is a comma separated list of missing fields\n* $2 is the number of missing fields", + "form-save-summary": "An edit summary", + "form-save-error": "Used as page title", + "form-save-error-text": "An error message" } -- To view, visit https://gerrit.wikimedia.org/r/401175 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I13008d3f1848150110916b3a110aff73dca66387 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Form Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: Siebrand Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Require MediaWiki 1.31 in extension.json for AutoloadNamespaces
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401182 ) Change subject: Require MediaWiki 1.31 in extension.json for AutoloadNamespaces .. Require MediaWiki 1.31 in extension.json for AutoloadNamespaces AutoloadNamespaces is a new feature in 1.31 Change-Id: I27f49f67c1c27b022b94aa5d76c064c30ec4762a --- M extension.json 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index 38cfa6c..7be24ea 100644 --- a/extension.json +++ b/extension.json @@ -7,6 +7,9 @@ "version": "1.0.0", "license-name": "GPL-2.0+", "type": "wikibase", + "requires": { + "MediaWiki": ">= 1.31.0" + }, "MessagesDirs": { "WikibaseQualityConstraints": [ "i18n" -- To view, visit https://gerrit.wikimedia.org/r/401182 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I27f49f67c1c27b022b94aa5d76c064c30ec4762a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Require MediaWiki 1.31 in extension.json for AutoloadNamespaces
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401179 ) Change subject: Require MediaWiki 1.31 in extension.json for AutoloadNamespaces .. Require MediaWiki 1.31 in extension.json for AutoloadNamespaces AutoloadNamespaces is a new feature in 1.31 Change-Id: Ife195aa2c0a6254b518206fe758be100f116fb2b --- M extension.json 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index 1bfae5d..1722339 100644 --- a/extension.json +++ b/extension.json @@ -10,6 +10,9 @@ "descriptionmsg": "kartographer-desc", "license-name": "MIT", "type": "other", + "requires": { + "MediaWiki": ">= 1.31.0" + }, "MessagesDirs": { "Kartographer": [ "i18n", -- To view, visit https://gerrit.wikimedia.org/r/401179 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ife195aa2c0a6254b518206fe758be100f116fb2b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Kartographer Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: MaxSem Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ReadingLists[master]: Require MediaWiki 1.31 in extension.json for AutoloadNamespaces
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401181 ) Change subject: Require MediaWiki 1.31 in extension.json for AutoloadNamespaces .. Require MediaWiki 1.31 in extension.json for AutoloadNamespaces AutoloadNamespaces is a new feature in 1.31 Change-Id: I197a18fb3197a2e264affc8e0f031f4b4613e795 --- M extension.json 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index fb89956..1cb2f6f 100644 --- a/extension.json +++ b/extension.json @@ -8,6 +8,9 @@ "descriptionmsg": "readinglists-desc", "license-name": "GPL-2.0+", "type": "other", + "requires": { + "MediaWiki": ">= 1.31.0" + }, "AutoloadNamespaces": { "MediaWiki\\Extensions\\ReadingLists\\": "src/" }, -- To view, visit https://gerrit.wikimedia.org/r/401181 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I197a18fb3197a2e264affc8e0f031f4b4613e795 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ReadingLists Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Mholloway 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...WikibaseQuality[master]: Require MediaWiki 1.31 in extension.json for AutoloadNamespaces
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401183 ) Change subject: Require MediaWiki 1.31 in extension.json for AutoloadNamespaces .. Require MediaWiki 1.31 in extension.json for AutoloadNamespaces AutoloadNamespaces is a new feature in 1.31 Change-Id: Ibd045a0577fec5d79903aa51b75e7b249a929d33 --- M extension.json 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index df0cb8c..a4fad71 100644 --- a/extension.json +++ b/extension.json @@ -6,6 +6,9 @@ "version": "1.0.0", "type": "wikibase", "license-name": "GPL-2.0+", + "requires": { + "MediaWiki": ">= 1.31.0" + }, "MessagesDirs": { "WikibaseQuality": [ "i18n" -- To view, visit https://gerrit.wikimedia.org/r/401183 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibd045a0577fec5d79903aa51b75e7b249a929d33 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQuality Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Update .gitattributes for .phpcs.xml file move
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401194 ) Change subject: Update .gitattributes for .phpcs.xml file move .. Update .gitattributes for .phpcs.xml file move Follows-up 3239163520. Change-Id: Ie1f871329ae487092667604ce6b44bde9c7a909c --- M .gitattributes 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitattributes b/.gitattributes index d7594cb..445f789 100644 --- a/.gitattributes +++ b/.gitattributes @@ -12,7 +12,7 @@ Gemfile* export-ignore Gruntfile.js export-ignore jsduck* export-ignore -phpcs.xml export-ignore +.phpcs.xml export-ignore phpunit.xml.dist export-ignore src export-ignore tests export-ignore -- To view, visit https://gerrit.wikimedia.org/r/401194 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie1f871329ae487092667604ce6b44bde9c7a909c Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Don't include Gemfile* in composer zipballs
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401193 ) Change subject: Don't include Gemfile* in composer zipballs .. Don't include Gemfile* in composer zipballs composer (via GitHub) excludes files listed in .gitattributes. Gemfile* are build files and don't need to be included. Change-Id: I612b3af26c25465654844584ffdb15265eb0262c --- M .gitattributes 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitattributes b/.gitattributes index fbd5ef0..d7594cb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,6 +9,7 @@ doc export-ignore docs export-ignore Doxyfile export-ignore +Gemfile* export-ignore Gruntfile.js export-ignore jsduck* export-ignore phpcs.xml export-ignore -- To view, visit https://gerrit.wikimedia.org/r/401193 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I612b3af26c25465654844584ffdb15265eb0262c Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Revision: Handle all return values of Title::newFromId
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/400408 ) Change subject: Revision: Handle all return values of Title::newFromId .. Revision: Handle all return values of Title::newFromId In Revision::getKnownCurrent, fail early when Title::newFromId returns null to avoid an uncatchable fatal error being triggered. RevisionStore#getKnownCurrentRevision requires that the title parameter be an instance of Title. This follows on from Ia4c20a91. Change-Id: I9bddafcc5df630d1dff1e2526194186cab7097e5 --- M includes/Revision.php M tests/phpunit/includes/RevisionDbTestBase.php 2 files changed, 22 insertions(+), 0 deletions(-) Approvals: Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Revision.php b/includes/Revision.php index 8f36e88..b8b56a3 100644 --- a/includes/Revision.php +++ b/includes/Revision.php @@ -1204,6 +1204,10 @@ ? $pageIdOrTitle : Title::newFromID( $pageIdOrTitle ); + if ( !$title ) { + return false; + } + $record = self::getRevisionStore()->getKnownCurrentRevision( $title, $revId ); return $record ? new Revision( $record ) : false; } diff --git a/tests/phpunit/includes/RevisionDbTestBase.php b/tests/phpunit/includes/RevisionDbTestBase.php index 9ab76c8..bd0dea6 100644 --- a/tests/phpunit/includes/RevisionDbTestBase.php +++ b/tests/phpunit/includes/RevisionDbTestBase.php @@ -1363,6 +1363,24 @@ $this->assertEquals( $rev->getId(), $cachedRow->rev_id ); } + public function testNewKnownCurrent_withPageId() { + $db = wfGetDB( DB_MASTER ); + + $this->testPage->doEditContent( new WikitextContent( __METHOD__ ), __METHOD__ ); + $rev = $this->testPage->getRevision(); + + $pageId = $this->testPage->getId(); + + $newRev = Revision::newKnownCurrent( $db, $pageId, $rev->getId() ); + $this->assertRevEquals( $rev, $newRev ); + } + + public function testNewKnownCurrent_returnsFalseWhenTitleDoesntExist() { + $db = wfGetDB( DB_MASTER ); + + $this->assertFalse( Revision::newKnownCurrent( $db, 0 ) ); + } + public function provideUserCanBitfield() { yield [ 0, 0, [], null, true ]; // Bitfields match, user has no permissions -- To view, visit https://gerrit.wikimedia.org/r/400408 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9bddafcc5df630d1dff1e2526194186cab7097e5 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Phuedx Gerrit-Reviewer: Addshore Gerrit-Reviewer: Daniel Kinzler Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Phuedx Gerrit-Reviewer: Thiemo Kreuz (WMDE) Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...GlobalUsage[master]: Fix Special:GloballyWantedFiles on sqlite
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401186 ) Change subject: Fix Special:GloballyWantedFiles on sqlite .. Fix Special:GloballyWantedFiles on sqlite sqlite requires specifying which img_title field to use in the ON condition. Change-Id: I47a591622ae5955757810ef1995e916a810bc111 --- M includes/GlobalUsage.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/GlobalUsage.php b/includes/GlobalUsage.php index 353a65f..1e45e35 100644 --- a/includes/GlobalUsage.php +++ b/includes/GlobalUsage.php @@ -262,7 +262,7 @@ 'options' => [ 'GROUP BY' => 'gil_to' ], 'join_conds' => [ 'img1' => [ 'LEFT JOIN', - 'gil_to = img_name' + 'gil_to = img1.img_name' ], 'page' => [ 'LEFT JOIN', [ 'gil_to = page_title', -- To view, visit https://gerrit.wikimedia.org/r/401186 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I47a591622ae5955757810ef1995e916a810bc111 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GlobalUsage Gerrit-Branch: master Gerrit-Owner: Brian Wolff Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: UserBoard i18n: Fix phrasing of Echo notification bundle mes...
SamanthaNguyen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401195 ) Change subject: UserBoard i18n: Fix phrasing of Echo notification bundle message .. UserBoard i18n: Fix phrasing of Echo notification bundle message This message has been phrased incorrectly, as it wrongly assumes that each message is sent by a different person. The easiest way to "fix" this error is to rephrase this message. - New: "{{PLURAL:$1|One message|$1 messages|100=99+ messages}} have been left on your user board." - Original: "{{PLURAL:$1|One person|$1 people|100=99+ people}} left messages on your user board." Steps to reproduce: 1. Install the Echo extension on your local test wiki 2. Sign into one of your accounts and send multiple messages (e.g 3) to another account of yours 3. Sign into your other account and visit [[Special:Notifications]], and receive this wrongly phrased message. Change-Id: Idcdeacf73a1479b7dbb0146736e0f3e72b81041f --- M UserBoard/i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SocialProfile refs/changes/95/401195/1 diff --git a/UserBoard/i18n/en.json b/UserBoard/i18n/en.json index 8cde24f..6529a17 100644 --- a/UserBoard/i18n/en.json +++ b/UserBoard/i18n/en.json @@ -58,7 +58,7 @@ "echo-category-title-social-msg": "User board messages", "echo-pref-tooltip-social-msg": "Notify me when someone leaves a message on my user board.", "notification-social-msg-send": "$1 just left a message on your user board.''$2''", - "notification-social-msg-send-bundle": "{{PLURAL:$1|One person|$1 people|100=99+ people}} left messages on your user board.", + "notification-social-msg-send-bundle": "{{PLURAL:$1|One message|$1 messages|100=99+ messages}} have been left on your user board.", "apihelp-socialprofile-send-message-description": "Send a message to a user's UserBoard.", "apihelp-socialprofile-send-message-summary": "Send a message to a user's UserBoard.", "apihelp-socialprofile-send-message-param-username": "The recipient's user name.", -- To view, visit https://gerrit.wikimedia.org/r/401195 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idcdeacf73a1479b7dbb0146736e0f3e72b81041f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SocialProfile Gerrit-Branch: master Gerrit-Owner: SamanthaNguyen ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: update jackson to version 2.9.3
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/400258 ) Change subject: update jackson to version 2.9.3 .. update jackson to version 2.9.3 The version of jackson that we are using is outdated (> 4 years) and will cause issues when introducing wiremock (or other lib requiring a reasonably recent version of jackson). And it is most of the time a good idea to keep dependencies up to date. Tests are still passing with this new version and jackson has a good track record of preserving compatibility. Change-Id: I4051bd08872a54284796a49383346fb14a00f147 --- M pom.xml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Smalyshev: Looks good to me, approved jenkins-bot: Verified diff --git a/pom.xml b/pom.xml index 0ff4ffb..69fddaf 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 2.1.5-SNAPSHOT -2.2.3 +2.9.3 9.2.3.v20140905 1.2.3 2.7.12 -- To view, visit https://gerrit.wikimedia.org/r/400258 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4051bd08872a54284796a49383346fb14a00f147 Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/rdf Gerrit-Branch: master Gerrit-Owner: Gehel Gerrit-Reviewer: Smalyshev Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Update .gitattributes for .phpcs.xml file move
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401194 ) Change subject: Update .gitattributes for .phpcs.xml file move .. Update .gitattributes for .phpcs.xml file move Follows-up 3239163520. Change-Id: Ie1f871329ae487092667604ce6b44bde9c7a909c --- M .gitattributes 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/94/401194/1 diff --git a/.gitattributes b/.gitattributes index d7594cb..445f789 100644 --- a/.gitattributes +++ b/.gitattributes @@ -12,7 +12,7 @@ Gemfile* export-ignore Gruntfile.js export-ignore jsduck* export-ignore -phpcs.xml export-ignore +.phpcs.xml export-ignore phpunit.xml.dist export-ignore src export-ignore tests export-ignore -- To view, visit https://gerrit.wikimedia.org/r/401194 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie1f871329ae487092667604ce6b44bde9c7a909c Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui 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] oojs/ui[master]: Don't include Gemfile* in composer zipballs
Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401193 ) Change subject: Don't include Gemfile* in composer zipballs .. Don't include Gemfile* in composer zipballs composer (via GitHub) excludes files listed in .gitattributes. Gemfile* are build files and don't need to be included. Change-Id: I612b3af26c25465654844584ffdb15265eb0262c --- M .gitattributes 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/93/401193/1 diff --git a/.gitattributes b/.gitattributes index fbd5ef0..d7594cb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,6 +9,7 @@ doc export-ignore docs export-ignore Doxyfile export-ignore +Gemfile* export-ignore Gruntfile.js export-ignore jsduck* export-ignore phpcs.xml export-ignore -- To view, visit https://gerrit.wikimedia.org/r/401193 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I612b3af26c25465654844584ffdb15265eb0262c Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui 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]: Add tests for ApiCheckToken
Phantom42 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401192 ) Change subject: Add tests for ApiCheckToken .. Add tests for ApiCheckToken Bug: T183768 Change-Id: I63ab0413252c7333f73b881995869454c4881a57 --- A tests/phpunit/includes/api/ApiCheckTokenTest.php 1 file changed, 65 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/92/401192/1 diff --git a/tests/phpunit/includes/api/ApiCheckTokenTest.php b/tests/phpunit/includes/api/ApiCheckTokenTest.php new file mode 100644 index 000..02a5abe --- /dev/null +++ b/tests/phpunit/includes/api/ApiCheckTokenTest.php @@ -0,0 +1,65 @@ +doApiRequest( [ +'action' => 'query', +'meta' => 'tokens', +] ); + +$data = $this->doApiRequest( [ +'action' => 'checktoken', +'type' => 'csrf', +'token' => $tokens[0]['query']['tokens']['csrftoken'], +], $tokens[1]->getSessionArray() ); + +$this->assertEquals( 'valid', $data[0]['checktoken']['result'] ); +$this->assertTrue( isset( $data[0]['checktoken']['generated'] ) ); +} + +/** + * Test result of checking invalid token + */ +public function testCheckTokenInvalid() { +$session = []; +$data = $this->doApiRequest( [ +'action' => 'checktoken', +'type' => 'csrf', +'token' => 'invalid_token', +], $session ); + +$this->assertEquals( 'invalid', $data[0]['checktoken']['result'] ); +} + +/** + * Test result of checking token with negative max age (should be expired) + */ +public function testCheckTokenExpired() { +// Query token which will be checked later +$tokens = $this->doApiRequest( [ +'action' => 'query', +'meta' => 'tokens', +] ); + +$data = $this->doApiRequest( [ +'action' => 'checktoken', +'type' => 'csrf', +'token' => $tokens[0]['query']['tokens']['csrftoken'], +'maxtokenage' => -1, +], $tokens[1]->getSessionArray() ); + +$this->assertEquals( 'expired', $data[0]['checktoken']['result'] ); +$this->assertTrue( isset( $data[0]['checktoken']['generated'] ) ); +} + +} -- To view, visit https://gerrit.wikimedia.org/r/401192 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I63ab0413252c7333f73b881995869454c4881a57 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Phantom42 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: download_dump: Handle cases when the dump file already exists
Rafidaslam has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401191 ) Change subject: download_dump: Handle cases when the dump file already exists .. download_dump: Handle cases when the dump file already exists Bug: T183667 Change-Id: Id205bd4f03393c8c59be918449dfd47366115f00 --- M scripts/maintenance/download_dump.py 1 file changed, 57 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/91/401191/1 diff --git a/scripts/maintenance/download_dump.py b/scripts/maintenance/download_dump.py index 853d33f..6d906d5 100644 --- a/scripts/maintenance/download_dump.py +++ b/scripts/maintenance/download_dump.py @@ -26,6 +26,8 @@ import os.path import sys +from datetime import datetime +from glob import glob from os import remove, symlink, urandom try: @@ -90,11 +92,64 @@ temp_filename = download_filename + '-' + \ binascii.b2a_hex(urandom(8)).decode('ascii') + '.part' -file_final_storepath = os.path.join( -self.getOption('storepath'), download_filename) +if self.getOption('revision') == 'latest': +date_str = datetime.now().strftime('%Y%m%d') + +# Make a new filename with the current date placed before the +# extension, +# for example 'idwiki-latest-abstract.xml-rss.xml' +# to 'idwiki-latest-abstract.xml-rss.20180101.xml' +# (just for the `latest` revision). +new_filename = download_filename.split('.') +new_filename.insert(-1, date_str) +new_filename = '.'.join(new_filename) + +file_final_storepath = os.path.join( +self.getOption('storepath'), new_filename) +else: +file_final_storepath = os.path.join( +self.getOption('storepath'), download_filename) + file_current_storepath = os.path.join( self.getOption('storepath'), temp_filename) +# Check if the file already exists in local +if os.path.exists(file_final_storepath): +pywikibot.output('File with path {path} already exists and ' + 'will not be downloaded again.'.format( + path=file_final_storepath + )) +return + +# Warn the user if the previous `latest` revision with the same +# name already exists. +if self.getOption('revision') == 'latest': +# The pattern to detect the same file, but different name. +filepath_glob_pattern = file_final_storepath.split('.') +filepath_glob_pattern[-2] = ( +'[0-9][0-9][0-9][0-9][0-1][0-9][0-3][0-9]') +filepath_glob_pattern = '.'.join(filepath_glob_pattern) + +similar_filepaths = glob(filepath_glob_pattern) + +# Search for file with the newest date +newest_file = [datetime(1, 1, 1), ''] # [date, filename] +for filepath in similar_filepaths: +file_date = datetime.strptime( +filepath.split('.')[-2], '%Y%m%d') +if file_date > newest_file[0]: +newest_file = [file_date, filepath] + +pywikibot.output('Warning, you\'re about to download a file that ' + 'is already exist before from the `latest`' + ' revision. The newest file downloaded for this ' + 'filename is located at {filepath} which was ' + 'downloaded at {date}. The file content might ' + 'be the same with the file that will be ' + 'downloaded'.format( + filepath=newest_file[1], + date=newest_file[0].strftime('%Y-%m-%d'))) + # https://wikitech.wikimedia.org/wiki/Help:Toolforge#Dumps toolforge_dump_filepath = self.get_dump_name( self.getOption('wikiname'), self.getOption('filename')) -- To view, visit https://gerrit.wikimedia.org/r/401191 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id205bd4f03393c8c59be918449dfd47366115f00 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Rafidaslam ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "dumps: Turn off dumps auto-sync to labstore1006 for ...
Madhuvishy has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401190 ) Change subject: Revert "dumps: Turn off dumps auto-sync to labstore1006 for reimaging" .. Revert "dumps: Turn off dumps auto-sync to labstore1006 for reimaging" This reverts commit 1c9a4581f7cac5014ab41200eb11f4697f2ce68b. Change-Id: I418472b7aa162c5806428b3faca31651659b3e8d --- M modules/profile/manifests/dumps/generation/server/primary.pp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Madhuvishy: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/profile/manifests/dumps/generation/server/primary.pp b/modules/profile/manifests/dumps/generation/server/primary.pp index bb88970..5d65c20 100644 --- a/modules/profile/manifests/dumps/generation/server/primary.pp +++ b/modules/profile/manifests/dumps/generation/server/primary.pp @@ -3,8 +3,8 @@ class { '::dumps::generation::server::rsyncer': xmldumpsdir=> $profile::dumps::generation::server::common::xmldumpsdir, -xmlremotedirs => 'dumpsdata1002.eqiad.wmnet::data/xmldatadumps/public/,dataset1001.wikimedia.org::data/xmldatadumps/public/', +xmlremotedirs => 'dumpsdata1002.eqiad.wmnet::data/xmldatadumps/public/,dataset1001.wikimedia.org::data/xmldatadumps/public/,labstore1006.wikimedia.org::data/xmldatadumps/public/', miscdumpsdir => $profile::dumps::generation::server::common::miscdatasetsdir, -miscremotedirs => 'dumpsdata1002.eqiad.wmnet::data/otherdumps/,dataset1001.wikimedia.org::data/xmldatadumps/public/other/', +miscremotedirs => 'dumpsdata1002.eqiad.wmnet::data/otherdumps/,dataset1001.wikimedia.org::data/xmldatadumps/public/other/,labstore1006.wikimedia.org::data/xmldatadumps/public/other/', } } -- To view, visit https://gerrit.wikimedia.org/r/401190 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I418472b7aa162c5806428b3faca31651659b3e8d Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Madhuvishy 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] operations/puppet[production]: Revert "dumps: Turn off dumps auto-sync to labstore1006 for ...
Hello jenkins-bot, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/401190 to review the following change. Change subject: Revert "dumps: Turn off dumps auto-sync to labstore1006 for reimaging" .. Revert "dumps: Turn off dumps auto-sync to labstore1006 for reimaging" This reverts commit 1c9a4581f7cac5014ab41200eb11f4697f2ce68b. Change-Id: I418472b7aa162c5806428b3faca31651659b3e8d --- M modules/profile/manifests/dumps/generation/server/primary.pp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/90/401190/1 diff --git a/modules/profile/manifests/dumps/generation/server/primary.pp b/modules/profile/manifests/dumps/generation/server/primary.pp index b932336..5ac8ce5 100644 --- a/modules/profile/manifests/dumps/generation/server/primary.pp +++ b/modules/profile/manifests/dumps/generation/server/primary.pp @@ -11,8 +11,8 @@ class { '::dumps::generation::server::rsyncer': xmldumpsdir=> '/data/xmldatadumps', -xmlremotedirs => 'dumpsdata1002.eqiad.wmnet::data/xmldatadumps/public/,dataset1001.wikimedia.org::data/xmldatadumps/public/', +xmlremotedirs => 'dumpsdata1002.eqiad.wmnet::data/xmldatadumps/public/,dataset1001.wikimedia.org::data/xmldatadumps/public/,labstore1006.wikimedia.org::data/xmldatadumps/public/', miscdumpsdir => '/data/otherdumps', -miscremotedirs => 'dumpsdata1002.eqiad.wmnet::data/otherdumps/,dataset1001.wikimedia.org::data/xmldatadumps/public/other/', +miscremotedirs => 'dumpsdata1002.eqiad.wmnet::data/otherdumps/,dataset1001.wikimedia.org::data/xmldatadumps/public/other/,labstore1006.wikimedia.org::data/xmldatadumps/public/other/', } } -- To view, visit https://gerrit.wikimedia.org/r/401190 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I418472b7aa162c5806428b3faca31651659b3e8d Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: 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...Linter[master]: Require MediaWiki 1.31 in extension.json for AutoloadNamespaces
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401180 ) Change subject: Require MediaWiki 1.31 in extension.json for AutoloadNamespaces .. Require MediaWiki 1.31 in extension.json for AutoloadNamespaces AutoloadNamespaces is a new feature in 1.31 Change-Id: If877db9d628598f3d91a55b767be421cfa8a50b1 --- M extension.json 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index e6c742c..4ad3f8a 100644 --- a/extension.json +++ b/extension.json @@ -9,6 +9,9 @@ ], "descriptionmsg": "linter-desc", "type": "specialpage", + "requires": { + "MediaWiki": ">= 1.31.0" + }, "AutoloadNamespaces": { "MediaWiki\\Linter\\": "includes/" }, -- To view, visit https://gerrit.wikimedia.org/r/401180 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If877db9d628598f3d91a55b767be421cfa8a50b1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Linter Gerrit-Branch: master Gerrit-Owner: Umherirrender 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] mediawiki...Timeless[master]: Remove fake element created before links so background align...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401188 ) Change subject: Remove fake element created before links so background aligns correctly .. Remove fake element created before links so background aligns correctly This rule seems to no longer apply to the skin in it's current state, and seems to be causing problems with references. These rules are an issue for that it creates a fake block element (which adds extra spacing at the top), creates a static height, and pulls it up with a negative top margin. It seems best to remove this CSS block. Bug: T181490 Change-Id: Id109e42731202f0c6e1ef6ff8855617e0795b35d --- M resources/screen-desktop.less 1 file changed, 0 insertions(+), 8 deletions(-) Approvals: jenkins-bot: Verified Isarra: Looks good to me, approved diff --git a/resources/screen-desktop.less b/resources/screen-desktop.less index a056e3e..1727078 100644 --- a/resources/screen-desktop.less +++ b/resources/screen-desktop.less @@ -60,14 +60,6 @@ display: none; } -/* Add offset to make anchor links work with the fixed header */ -:target:before { - content: ''; - display: block; - height: @fixed-header-height; - margin: -@fixed-header-height 0 0; -} - .dropdown { display: none !important; } -- To view, visit https://gerrit.wikimedia.org/r/401188 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id109e42731202f0c6e1ef6ff8855617e0795b35d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Timeless Gerrit-Branch: master Gerrit-Owner: SamanthaNguyen Gerrit-Reviewer: Isarra Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Add unit test for adding publishers via API
Pppery has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401189 ) Change subject: Add unit test for adding publishers via API .. Add unit test for adding publishers via API Bug: T183817 Bug: T182820 Change-Id: I1f64494936bfdfb8c46b334f8b38141566bcabca --- M tests/content/NewsletterAPIEditTest.php 1 file changed, 38 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter refs/changes/89/401189/1 diff --git a/tests/content/NewsletterAPIEditTest.php b/tests/content/NewsletterAPIEditTest.php index c7ef3c8..e81f67a 100644 --- a/tests/content/NewsletterAPIEditTest.php +++ b/tests/content/NewsletterAPIEditTest.php @@ -10,6 +10,7 @@ protected function setUp() { parent::setUp(); $this->doLogin(); + $this->tablesUsed = [ 'nl_newsletters', 'nl_publishers', 'nl_subscriptions' ]; } public function testCreation() { $description = "A description that is at least 30 characters long"; @@ -100,7 +101,6 @@ \"description\": \"$description\", \"mainpage\": \"$newMainPage\", \"publishers\": [ - \"UTSysop\" ] }"; $this->doApiRequestWithToken( @@ -115,4 +115,41 @@ $newsletter = Newsletter::newFromName( "Test" ); $this->assertEquals( $newsletter->getPageId(), $newMainPageId ); } + public function testAddPublisher() { + # Set up by creating newsletter + $description = "A description that is at least 30 characters long"; + $mainPage = 'UTPage'; + $mainPageId = Title::newFromText( $mainPage )->getArticleId(); + $newsletter = new Newsletter( 0, 'Test', $description, $mainPageId ); + NewsletterStore::getDefaultInstance()->addNewsletter( $newsletter ); + + $newsletter = Newsletter::newFromName( "Test" ); + $this->assertNotNull( $newsletter ); + + # Newsletter should initially have no publishers and no subscribers + $this->assertEquals( $newsletter->getPublishers(), [] ); + $this->assertEquals( $newsletter->getSubscribers(), [] ); + + # Modify the publishers + $newText = "{ + \"description\": \"$description\", + \"mainpage\": \"$mainPage\", + \"publishers\": [ + \"UTSysop\" + ] + }"; + $this->doApiRequestWithToken( + [ + 'action' => 'edit', + 'title' => "Newsletter:Test", + 'text' => $newText, + ] + ); + + # Check that user was correctly added + $expectedUsers = [ User::newFromname( "UTSysop" )->getId() ]; + $newsletter = Newsletter::newFromName( "Test" ); + $this->assertEquals( $newsletter->getPublishers(), $expectedUsers ); + $this->assertEquals( $newsletter->getSubscribers(), $expectedUsers ); + } } -- To view, visit https://gerrit.wikimedia.org/r/401189 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1f64494936bfdfb8c46b334f8b38141566bcabca Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Newsletter Gerrit-Branch: master Gerrit-Owner: Pppery ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Timeless[master]: Remove fake element created before links so background align...
SamanthaNguyen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401188 ) Change subject: Remove fake element created before links so background aligns correctly .. Remove fake element created before links so background aligns correctly This rule seems to no longer apply to the skin in it's current state, and seems to be causing problems with references. These rules are an issue for that it creates a fake block element (which adds extra spacing at the top), creates a static height, and pulls it up with a negative top margin. It seems best to remove this CSS block. Bug: T181490 Change-Id: Id109e42731202f0c6e1ef6ff8855617e0795b35d --- M resources/screen-desktop.less 1 file changed, 0 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Timeless refs/changes/88/401188/1 diff --git a/resources/screen-desktop.less b/resources/screen-desktop.less index a056e3e..1727078 100644 --- a/resources/screen-desktop.less +++ b/resources/screen-desktop.less @@ -60,14 +60,6 @@ display: none; } -/* Add offset to make anchor links work with the fixed header */ -:target:before { - content: ''; - display: block; - height: @fixed-header-height; - margin: -@fixed-header-height 0 0; -} - .dropdown { display: none !important; } -- To view, visit https://gerrit.wikimedia.org/r/401188 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id109e42731202f0c6e1ef6ff8855617e0795b35d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Timeless Gerrit-Branch: master Gerrit-Owner: SamanthaNguyen ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: [repong] Fix auto-merging of some patches
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401054 ) Change subject: [repong] Fix auto-merging of some patches .. [repong] Fix auto-merging of some patches The repo type check was using the last item from the loop, which does not make sense. Removed the check that is no longer necessary. Also fixed merge-wmgerrit-patches to fail on errors so that these things are more apparent. Change-Id: Id6ef5e7e34159a0eb9195903128e4996cffcacfb --- M bin/merge-wmgerrit-patches M repong/repong.php 2 files changed, 12 insertions(+), 8 deletions(-) Approvals: jenkins-bot: Verified Nikerabbit: Looks good to me, approved diff --git a/bin/merge-wmgerrit-patches b/bin/merge-wmgerrit-patches index 05448f8..fe1d898 100755 --- a/bin/merge-wmgerrit-patches +++ b/bin/merge-wmgerrit-patches @@ -1,10 +1,13 @@ #!/bin/bash -U="l10n-bot" -GERRIT="$u...@gerrit.wikimedia.org -p 29418 gerrit" -PROJECT="$1" +set -e +set -o pipefail -for i in `ssh $GERRIT query --format=TEXT owner:$U project:$PROJECT status:open | grep ' url:' |cut -d/ -f5 |sort` -do -ssh $GERRIT review $i,1 --code-review 2 --verified 2 --submit -done +U="l10n-bot" +GERRIT="$u...@gerrit.wikimedia.org -p 29418" + +ssh "$GERRIT" gerrit query --format=TEXT "owner:$U" "project:$1" status:open | +grep ' url:' | +cut -d/ -f5 | +sort | +xargs -I ssh "$GERRIT" gerrit review ,1 --code-review 2 --verified 2 --submit diff --git a/repong/repong.php b/repong/repong.php index 4cc7328..fae3f90 100644 --- a/repong/repong.php +++ b/repong/repong.php @@ -425,8 +425,9 @@ // Merge patch sets submitted to Wikimedia's Gerrit. $mergePattern = $config[ 'auto-merge' ] ?? false; - if ( $repo['type'] === 'wmgerrit' && $mergePattern ) { + if ( $mergePattern ) { $command = $this->bindir . "/merge-wmgerrit-patches '$mergePattern'"; + echo $command . "\n"; $mergeProcess = new Process( $command ); $mergeProcess->setTimeout( 600 ); $mergeProcess->mustRun(); -- To view, visit https://gerrit.wikimedia.org/r/401054 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id6ef5e7e34159a0eb9195903128e4996cffcacfb Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Don't automatically add creator to publishers/subscribers in...
Pppery has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401187 ) Change subject: Don't automatically add creator to publishers/subscribers in NewsletterDataUpdate .. Don't automatically add creator to publishers/subscribers in NewsletterDataUpdate When NewsletterDataUpdate runs, the Newsletter json page has already been created, so doing this causes the page and the nl_publishers database to disagree. Change-Id: Ic31a4dc41a4736f6ce852ab933d669ee3c245b79 --- M includes/content/NewsletterDataUpdate.php 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter refs/changes/87/401187/1 diff --git a/includes/content/NewsletterDataUpdate.php b/includes/content/NewsletterDataUpdate.php index ee5dc86..1284315 100644 --- a/includes/content/NewsletterDataUpdate.php +++ b/includes/content/NewsletterDataUpdate.php @@ -67,9 +67,6 @@ return false; } - $newsletter->subscribe( $this->user ); - $store->addPublisher( $newsletter, [ $this->user->getId() ] ); - return $newsletter; } -- To view, visit https://gerrit.wikimedia.org/r/401187 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic31a4dc41a4736f6ce852ab933d669ee3c245b79 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Newsletter Gerrit-Branch: master Gerrit-Owner: Pppery ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...GlobalUsage[master]: Fix Special:GloballyWantedFiles on sqlite
Brian Wolff has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401186 ) Change subject: Fix Special:GloballyWantedFiles on sqlite .. Fix Special:GloballyWantedFiles on sqlite sqlite requires specifying which img_title field to use in the ON condition. Change-Id: I47a591622ae5955757810ef1995e916a810bc111 --- M includes/GlobalUsage.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalUsage refs/changes/86/401186/1 diff --git a/includes/GlobalUsage.php b/includes/GlobalUsage.php index 353a65f..1e45e35 100644 --- a/includes/GlobalUsage.php +++ b/includes/GlobalUsage.php @@ -262,7 +262,7 @@ 'options' => [ 'GROUP BY' => 'gil_to' ], 'join_conds' => [ 'img1' => [ 'LEFT JOIN', - 'gil_to = img_name' + 'gil_to = img1.img_name' ], 'page' => [ 'LEFT JOIN', [ 'gil_to = page_title', -- To view, visit https://gerrit.wikimedia.org/r/401186 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I47a591622ae5955757810ef1995e916a810bc111 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GlobalUsage Gerrit-Branch: master Gerrit-Owner: Brian Wolff ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...GlobalUsage[master]: Create Special:GloballyUnusedFiles page
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401092 ) Change subject: Create Special:GloballyUnusedFiles page .. Create Special:GloballyUnusedFiles page This special page shows files which are unused at all wikis. So in fact this special page is global equivalent to Special:UnusedFiles Bug: T183673 Change-Id: I47a591622ae5955757810ef1995e916a810bc506 --- M GlobalUsage.alias.php M extension.json M i18n/en.json M i18n/qqq.json M includes/GlobalUsageHooks.php A includes/SpecialGloballyUnusedFiles.php 6 files changed, 143 insertions(+), 3 deletions(-) Approvals: Brian Wolff: Looks good to me, approved jenkins-bot: Verified diff --git a/GlobalUsage.alias.php b/GlobalUsage.alias.php index a0ddb61..3b6e2c4 100644 --- a/GlobalUsage.alias.php +++ b/GlobalUsage.alias.php @@ -13,6 +13,7 @@ 'GlobalUsage' => [ 'GlobalUsage' ], 'MostGloballyLinkedFiles' => [ 'MostGloballyLinkedFiles' ], 'GloballyWantedFiles' => [ 'GloballyWantedFiles' ], + 'GloballyUnusedFiles' => [ 'GloballyUnusedFiles' ] ]; /** Arabic (العربية) */ diff --git a/extension.json b/extension.json index f2aba51..84acdd7 100644 --- a/extension.json +++ b/extension.json @@ -12,6 +12,7 @@ "SpecialPages": { "MostGloballyLinkedFiles": "SpecialMostGloballyLinkedFiles", "GloballyWantedFiles": "SpecialGloballyWantedFiles", + "GloballyUnusedFiles": "SpecialGloballyUnusedFiles", "GlobalUsage": "SpecialGlobalUsage" }, "JobClasses": { @@ -37,7 +38,8 @@ "ApiQueryGlobalUsage": "includes/ApiQueryGlobalUsage.php", "GlobalUsageCachePurgeJob": "includes/GlobalUsageCachePurgeJob.php", "SpecialMostGloballyLinkedFiles": "includes/SpecialMostGloballyLinkedFiles.php", - "SpecialGloballyWantedFiles": "includes/SpecialGloballyWantedFiles.php" + "SpecialGloballyWantedFiles": "includes/SpecialGloballyWantedFiles.php", + "SpecialGloballyUnusedFiles": "includes/SpecialGloballyUnusedFiles.php" }, "@doc": [ "Things that can cause link updates:", diff --git a/i18n/en.json b/i18n/en.json index 31733a6..191c021 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -27,5 +27,8 @@ "apihelp-query+globalusage-param-filterlocal": "Filter local usage of the file.", "apihelp-query+globalusage-example-1": "Get usage of [[:File:Example.jpg]]", "globalusage-header": "This page shows where a file is used on other wikis. You can also find that information at the bottom of the file description page.", - "globalusage-header-image": "" + "globalusage-header-image": "", + "globallyunusedfiles": "Globally unused files", + "globallyunusedfilestext": "The following files exist but are not embedded in any page on any wiki.", + "globallyunusedfiles-error-nonsharedrepo": "This wiki is not on the shared repo" } diff --git a/i18n/qqq.json b/i18n/qqq.json index 1d3db4a..28b49dd 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -39,5 +39,8 @@ "apihelp-query+globalusage-param-filterlocal": "{{doc-apihelp-param|query+globalusage|filterlocal}}", "apihelp-query+globalusage-example-1": "{{doc-apihelp-example|query+globalusage}}", "globalusage-header": "Text message used in [[Special:GlobalUsage]] right above the form describing the purpose of special page.", - "globalusage-header-image": "{{notranslate}}. Extra header for on-wiki customization. $1 - File being looked for." + "globalusage-header-image": "{{notranslate}}. Extra header for on-wiki customization. $1 - File being looked for.", + "globallyunusedfilestext": "Header message of [[Special:GloballyUnusedFiles]]", + "globallyunusedfiles": "{{doc-special|GloballyUnusedFiles}}", + "globallyunusedfiles-error-nonsharedrepo": "This error is displayed if user tries to access wiki which is not on shared repo" } diff --git a/includes/GlobalUsageHooks.php b/includes/GlobalUsageHooks.php index 006abf8..e515a96 100644 --- a/includes/GlobalUsageHooks.php +++ b/includes/GlobalUsageHooks.php @@ -223,6 +223,9 @@ public static function onwgQueryPages( &$queryPages ) { $queryPages[] = [ 'SpecialMostGloballyLinkedFiles', 'MostGloballyLinkedFiles' ]; $queryPages[] = [ 'SpecialGloballyWantedFiles', 'GloballyWantedFiles' ]; + if ( GlobalUsage::onSharedRepo() ) { + $queryPages[] = [ 'SpecialGloballyUnusedFiles', 'GloballyUnusedFiles' ]; + } return true; } } diff --git a/includes/SpecialGloballyUnusedFiles.php b/includes/SpecialGloballyUnusedFiles.php new file mode 100644 index 000..0c05671 --- /dev/null +++ b/includes/SpecialGloballyUnusedFiles.php @@ -0,0 +1,128 @@ +http://www.gnu.org
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Add unit tests for changing description and main page of new...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401185 ) Change subject: Add unit tests for changing description and main page of newsletters via API .. Add unit tests for changing description and main page of newsletters via API Bug: T183817 Bug: T183819 Change-Id: I82dc3347b9ba1f7cc7787f85735b6237092f42cc --- M tests/content/NewsletterAPIEditTest.php 1 file changed, 64 insertions(+), 0 deletions(-) Approvals: 01tonythomas: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/content/NewsletterAPIEditTest.php b/tests/content/NewsletterAPIEditTest.php index bf5b414..c7ef3c8 100644 --- a/tests/content/NewsletterAPIEditTest.php +++ b/tests/content/NewsletterAPIEditTest.php @@ -51,4 +51,68 @@ $this->assertEquals( $newsletter->getPublishers(), $expectedUsers ); $this->assertEquals( $newsletter->getSubscribers(), $expectedUsers ); } + + public function testUpdateDescription() { + # Set up by creating newsletter + $initialDescription = "A description that is at least 30 characters long"; + $finalDescription = "A description that is still at least 30 characters long"; + $mainPage = 'UTPage'; + $mainPageId = Title::newFromText( $mainPage )->getArticleId(); + $newsletter = new Newsletter( 0, 'Test', $initialDescription, $mainPageId ); + NewsletterStore::getDefaultInstance()->addNewsletter( $newsletter ); + + # Modify the description + $newText = "{ + \"description\": \"$finalDescription\", + \"mainpage\": \"$mainPage\", + \"publishers\": [ + \"UTSysop\" + ] + }"; + $this->doApiRequestWithToken( + [ + 'action' => 'edit', + 'title' => "Newsletter:Test", + 'text' => $newText, + ] + ); + + # Check the description + $newsletter = Newsletter::newFromName( "Test" ); + $this->assertEquals( $newsletter->getDescription(), $finalDescription ); + } + + public function testUpdateMainPage() { + # Set up by creating newsletter + $description = "A description that is at least 30 characters long"; + $oldMainPage = 'UTPage'; + $oldMainPageId = Title::newFromText( $oldMainPage )->getArticleId(); + $newsletter = new Newsletter( 0, 'Test', $description, $oldMainPageId ); + $newMainPage = "SecondPage"; + $newMainPageId = $this->insertPage( $newMainPage )["id"]; + NewsletterStore::getDefaultInstance()->addNewsletter( $newsletter ); + + $newsletter = Newsletter::newFromName( "Test" ); + $this->assertNotNull( $newsletter ); + + # Modify the main page + $newText = "{ + \"description\": \"$description\", + \"mainpage\": \"$newMainPage\", + \"publishers\": [ + \"UTSysop\" + ] + }"; + $this->doApiRequestWithToken( + [ + 'action' => 'edit', + 'title' => "Newsletter:Test", + 'text' => $newText, + ] + ); + + # Check the main page + $newsletter = Newsletter::newFromName( "Test" ); + $this->assertEquals( $newsletter->getPageId(), $newMainPageId ); + } } -- To view, visit https://gerrit.wikimedia.org/r/401185 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I82dc3347b9ba1f7cc7787f85735b6237092f42cc Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/Newsletter Gerrit-Branch: master Gerrit-Owner: Pppery Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com> Gerrit-Reviewer: Addshore Gerrit-Reviewer: Pppery Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [TEST] Verify the group of site.botusers() users
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401184 ) Change subject: [TEST] Verify the group of site.botusers() users .. [TEST] Verify the group of site.botusers() users Follows I066eecb25358ae054d7abc925574550153a83a6a Change-Id: Ibb94045325493348642570e93bd331f8452b3f03 --- M tests/site_tests.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tests/site_tests.py b/tests/site_tests.py index b0f7287..0acfa44 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -760,6 +760,7 @@ self.assertIn('userid', botuser) self.assertIn('editcount', botuser) self.assertIn('registration', botuser) +self.assertIn('bot', botuser['groups']) def test_allusers(self): """Test the site.allusers() method.""" @@ -771,6 +772,7 @@ self.assertIn("name", user) self.assertIn("editcount", user) self.assertIn("registration", user) +self.assertIn('user', user['groups']) def test_allusers_with_start(self): """Test the site.allusers(start=..) method.""" -- To view, visit https://gerrit.wikimedia.org/r/401184 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibb94045325493348642570e93bd331f8452b3f03 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Framawiki Gerrit-Reviewer: John Vandenberg Gerrit-Reviewer: Xqt Gerrit-Reviewer: Zoranzoki21 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Add unit tests for changing description and main page of new...
Pppery has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401185 ) Change subject: Add unit tests for changing description and main page of newsletters via API .. Add unit tests for changing description and main page of newsletters via API Bug: T183817 Bug: T183819 Change-Id: I82dc3347b9ba1f7cc7787f85735b6237092f42cc --- M tests/content/NewsletterAPIEditTest.php 1 file changed, 59 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter refs/changes/85/401185/1 diff --git a/tests/content/NewsletterAPIEditTest.php b/tests/content/NewsletterAPIEditTest.php index bf5b414..0588b5c 100644 --- a/tests/content/NewsletterAPIEditTest.php +++ b/tests/content/NewsletterAPIEditTest.php @@ -51,4 +51,63 @@ $this->assertEquals( $newsletter->getPublishers(), $expectedUsers ); $this->assertEquals( $newsletter->getSubscribers(), $expectedUsers ); } + + public function testUpdateDescription() { + # Set up by creating first newsletter + $initialDescription = "A description that is at least 30 characters long"; + $finalDescription = "A description that is still at least 30 characters long"; + $mainPage = 'UTPage'; + $mainPageId = Title::newFromText( $mainPage )->getArticleId(); + $newsletter = new Newsletter( 0, 'Test', $initialDescription, $mainPageId ); + NewsletterStore::getDefaultInstance()->addNewsletter( $newsletter ); + + # Modify the description + $newText = "{ + \"description\": \"$finalDescription\", + \"mainpage\": \"$mainPage\", + \"publishers\": [ + \"UTSysop\" + ] + }"; + $this->doApiRequestWithToken( + [ + 'action' => 'edit', + 'title' => "Newsletter:Test", + 'text' => $newText, + ] + ); + + # Check the description + $newsletter = Newsletter::newFromName( "Test" ); + $this->assertEquals( $newsletter->getDescription(), $finalDescription ); + } + + public function testUpdateMainPage() { + # Set up by creating first newsletter + $description = "A description that is at least 30 characters long"; + $newMainPage = 'UTPage'; + $newsletter = new Newsletter( 0, 'Test', $description, 0 ); + NewsletterStore::getDefaultInstance()->addNewsletter( $newsletter ); + + # Modify the main page + $newText = "{ + \"description\": \"$description\", + \"mainpage\": \"$newMainPage\", + \"publishers\": [ + \"UTSysop\" + ] + }"; + $this->doApiRequestWithToken( + [ + 'action' => 'edit', + 'title' => "Newsletter:Test", + 'text' => $newText, + ] + ); + + # Check the main page + $expectedPageId = Title::newFromText( $newMainPage )->getArticleId(); + $newsletter = Newsletter::newFromName( "Test" ); + $this->assertEquals( $newsletter->getPageId(), $expectedPageId ); + } } -- To view, visit https://gerrit.wikimedia.org/r/401185 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I82dc3347b9ba1f7cc7787f85735b6237092f42cc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Newsletter Gerrit-Branch: master Gerrit-Owner: Pppery ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...AdminLinks[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
Yaron Koren has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401103 ) Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0 .. build: Updating mediawiki/mediawiki-codesniffer to 15.0.0 Change-Id: I8e271513e8d5daf4e0b1a90bf92c11c305d223ca --- M .phpcs.xml M composer.json 2 files changed, 3 insertions(+), 2 deletions(-) Approvals: Yaron Koren: Looks good to me, approved jenkins-bot: Verified diff --git a/.phpcs.xml b/.phpcs.xml index b957e41..e38ac01 100644 --- a/.phpcs.xml +++ b/.phpcs.xml @@ -3,8 +3,9 @@ - + + diff --git a/composer.json b/composer.json index 79b6d3d..6393815 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ }, "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "14.1.0", + "mediawiki/mediawiki-codesniffer": "15.0.0", "jakub-onderka/php-console-highlighter": "0.3.2", "mediawiki/minus-x": "0.2.1" }, -- To view, visit https://gerrit.wikimedia.org/r/401103 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8e271513e8d5daf4e0b1a90bf92c11c305d223ca Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AdminLinks Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Legoktm Gerrit-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/vagrant[stretch-migration]: rake: move test definitions to tests directory
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/400201 ) Change subject: rake: move test definitions to tests directory .. rake: move test definitions to tests directory Clean up the root directly slightly by moving the Cucumber and RSpec test files into a 'tests' directory. Change-Id: I5847f5e122ea8497aeb7bbb33b8d024972ff6211 --- M Rakefile R tests/features/config.feature R tests/features/role_settings.feature R tests/features/roles.feature R tests/features/step_definitions/common_steps.rb R tests/features/step_definitions/roles_steps.rb R tests/features/step_definitions/settings_steps.rb R tests/features/support/env.rb R tests/features/support/hooks.rb R tests/features/support/output_helper.rb R tests/spec/mediawiki_vagrant/environment_spec.rb R tests/spec/mediawiki_vagrant/setting_spec.rb R tests/spec/mediawiki_vagrant/settings/definitions_spec.rb R tests/spec/mediawiki_vagrant/settings_definer_spec.rb R tests/spec/mediawiki_vagrant/settings_spec.rb R tests/spec/spec_helper.rb R tests/spec/support/mock_environment.rb R tests/spec/support/string.rb 18 files changed, 5 insertions(+), 2 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/Rakefile b/Rakefile index f7c978f..b057e5a 100644 --- a/Rakefile +++ b/Rakefile @@ -33,9 +33,12 @@ config.log_format = '%{path}:%{line} %{KIND}: %{message}' end Cucumber::Rake::Task.new(:cucumber) do |t| + t.cucumber_opts = '-r tests/features tests/features' t.fork = false end -RSpec::Core::RakeTask.new(:spec) +RSpec::Core::RakeTask.new(:spec) do |t| + t.rspec_opts = '-I tests/spec --default-path tests' +end RuboCop::RakeTask.new(:rubocop) task default: [:test] diff --git a/features/config.feature b/tests/features/config.feature similarity index 100% rename from features/config.feature rename to tests/features/config.feature diff --git a/features/role_settings.feature b/tests/features/role_settings.feature similarity index 100% rename from features/role_settings.feature rename to tests/features/role_settings.feature diff --git a/features/roles.feature b/tests/features/roles.feature similarity index 100% rename from features/roles.feature rename to tests/features/roles.feature diff --git a/features/step_definitions/common_steps.rb b/tests/features/step_definitions/common_steps.rb similarity index 100% rename from features/step_definitions/common_steps.rb rename to tests/features/step_definitions/common_steps.rb diff --git a/features/step_definitions/roles_steps.rb b/tests/features/step_definitions/roles_steps.rb similarity index 100% rename from features/step_definitions/roles_steps.rb rename to tests/features/step_definitions/roles_steps.rb diff --git a/features/step_definitions/settings_steps.rb b/tests/features/step_definitions/settings_steps.rb similarity index 100% rename from features/step_definitions/settings_steps.rb rename to tests/features/step_definitions/settings_steps.rb diff --git a/features/support/env.rb b/tests/features/support/env.rb similarity index 100% rename from features/support/env.rb rename to tests/features/support/env.rb diff --git a/features/support/hooks.rb b/tests/features/support/hooks.rb similarity index 100% rename from features/support/hooks.rb rename to tests/features/support/hooks.rb diff --git a/features/support/output_helper.rb b/tests/features/support/output_helper.rb similarity index 100% rename from features/support/output_helper.rb rename to tests/features/support/output_helper.rb diff --git a/spec/mediawiki_vagrant/environment_spec.rb b/tests/spec/mediawiki_vagrant/environment_spec.rb similarity index 99% rename from spec/mediawiki_vagrant/environment_spec.rb rename to tests/spec/mediawiki_vagrant/environment_spec.rb index f48d922..3a1969b 100644 --- a/spec/mediawiki_vagrant/environment_spec.rb +++ b/tests/spec/mediawiki_vagrant/environment_spec.rb @@ -473,7 +473,7 @@ subject { environment.valid? } context 'when the environment directory is the project directory' do -let(:environment) { Environment.new(File.expand_path('../../../', __FILE__)) } +let(:environment) { Environment.new(File.expand_path('../../../../', __FILE__)) } it { is_expected.to be(true) } end diff --git a/spec/mediawiki_vagrant/setting_spec.rb b/tests/spec/mediawiki_vagrant/setting_spec.rb similarity index 100% rename from spec/mediawiki_vagrant/setting_spec.rb rename to tests/spec/mediawiki_vagrant/setting_spec.rb diff --git a/spec/mediawiki_vagrant/settings/definitions_spec.rb b/tests/spec/mediawiki_vagrant/settings/definitions_spec.rb similarity index 100% rename from spec/mediawiki_vagrant/settings/definitions_spec.rb rename to tests/spec/mediawiki_vagrant/settings/definitions_spec.rb diff --git a/spec/mediawiki_vagrant/settings_definer_spec.rb b/tests/spec/mediawiki_vagrant/settings_definer_spec.rb similarity index 100% r
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Add unit test for creation of newsletters via API
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401115 ) Change subject: Add unit test for creation of newsletters via API .. Add unit test for creation of newsletters via API Bug: T183817 Bug: T183818 Change-Id: If26b408efb9c443f5fe4edb14e1d30652b03c974 --- A tests/content/NewsletterAPIEditTest.php 1 file changed, 54 insertions(+), 0 deletions(-) Approvals: 01tonythomas: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/content/NewsletterAPIEditTest.php b/tests/content/NewsletterAPIEditTest.php new file mode 100644 index 000..bf5b414 --- /dev/null +++ b/tests/content/NewsletterAPIEditTest.php @@ -0,0 +1,54 @@ +doLogin(); + } + public function testCreation() { + $description = "A description that is at least 30 characters long"; + $newsletterTitle = "Newsletter:Test"; + $mainPage = "UTPage"; + $text = "{ + \"description\": \"$description\", + \"mainpage\": \"$mainPage\", + \"publishers\": [ + \"UTSysop\" + ] + }"; + + # Create the newsletter + $this->doApiRequestWithToken( + [ + 'action' => 'edit', + 'title' => $newsletterTitle, + 'text' => $text, + ] + ); + + $page = new WikiPage( Title::newFromText( $newsletterTitle ) ); + $content = $page->getContent(); + $newsletter = NewsletterStore::getDefaultInstance()->getNewsletterFromName( "Test" ); + $this->assertNotNull( $newsletter ); + + # Check description + $this->assertEquals( $newsletter->getDescription(), $description ); + $this->assertEquals( $content->getDescription(), $description ); + + # Check main page + $expectedPageId = Title::newFromText( $mainPage )->getArticleId(); + $this->assertEquals( $newsletter->getPageId(), $expectedPageId ); + $this->assertEquals( $content->getMainPage(), $mainPage ); + + # Check publishers and subsrcibers + $expectedUsers = [ User::newFromname( "UTSysop" )->getId() ]; + $this->assertEquals( $newsletter->getPublishers(), $expectedUsers ); + $this->assertEquals( $newsletter->getSubscribers(), $expectedUsers ); + } +} -- To view, visit https://gerrit.wikimedia.org/r/401115 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If26b408efb9c443f5fe4edb14e1d30652b03c974 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/Newsletter Gerrit-Branch: master Gerrit-Owner: Pppery Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com> Gerrit-Reviewer: Addshore Gerrit-Reviewer: Pppery Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [TEST] Verify the group of site.botusers() users
Framawiki has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401184 ) Change subject: [TEST] Verify the group of site.botusers() users .. [TEST] Verify the group of site.botusers() users Follows I066eecb25358ae054d7abc925574550153a83a6a Change-Id: Ibb94045325493348642570e93bd331f8452b3f03 --- M tests/site_tests.py 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/84/401184/1 diff --git a/tests/site_tests.py b/tests/site_tests.py index b0f7287..0acfa44 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -760,6 +760,7 @@ self.assertIn('userid', botuser) self.assertIn('editcount', botuser) self.assertIn('registration', botuser) +self.assertIn('bot', botuser['groups']) def test_allusers(self): """Test the site.allusers() method.""" @@ -771,6 +772,7 @@ self.assertIn("name", user) self.assertIn("editcount", user) self.assertIn("registration", user) +self.assertIn('user', user['groups']) def test_allusers_with_start(self): """Test the site.allusers(start=..) method.""" -- To view, visit https://gerrit.wikimedia.org/r/401184 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibb94045325493348642570e93bd331f8452b3f03 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Framawiki ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQuality[master]: Require MediaWiki 1.31 in extension.json for AutoloadNamespaces
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401183 ) Change subject: Require MediaWiki 1.31 in extension.json for AutoloadNamespaces .. Require MediaWiki 1.31 in extension.json for AutoloadNamespaces AutoloadNamespaces is a new feature in 1.31 Change-Id: Ibd045a0577fec5d79903aa51b75e7b249a929d33 --- M extension.json 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQuality refs/changes/83/401183/1 diff --git a/extension.json b/extension.json index df0cb8c..a4fad71 100644 --- a/extension.json +++ b/extension.json @@ -6,6 +6,9 @@ "version": "1.0.0", "type": "wikibase", "license-name": "GPL-2.0+", + "requires": { + "MediaWiki": ">= 1.31.0" + }, "MessagesDirs": { "WikibaseQuality": [ "i18n" -- To view, visit https://gerrit.wikimedia.org/r/401183 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd045a0577fec5d79903aa51b75e7b249a929d33 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQuality Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ReadingLists[master]: Require MediaWiki 1.31 in extension.json for AutoloadNamespaces
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401181 ) Change subject: Require MediaWiki 1.31 in extension.json for AutoloadNamespaces .. Require MediaWiki 1.31 in extension.json for AutoloadNamespaces AutoloadNamespaces is a new feature in 1.31 Change-Id: I197a18fb3197a2e264affc8e0f031f4b4613e795 --- M extension.json 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ReadingLists refs/changes/81/401181/1 diff --git a/extension.json b/extension.json index fb89956..1cb2f6f 100644 --- a/extension.json +++ b/extension.json @@ -8,6 +8,9 @@ "descriptionmsg": "readinglists-desc", "license-name": "GPL-2.0+", "type": "other", + "requires": { + "MediaWiki": ">= 1.31.0" + }, "AutoloadNamespaces": { "MediaWiki\\Extensions\\ReadingLists\\": "src/" }, -- To view, visit https://gerrit.wikimedia.org/r/401181 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I197a18fb3197a2e264affc8e0f031f4b4613e795 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ReadingLists Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Require MediaWiki 1.31 in extension.json for AutoloadNamespaces
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401182 ) Change subject: Require MediaWiki 1.31 in extension.json for AutoloadNamespaces .. Require MediaWiki 1.31 in extension.json for AutoloadNamespaces AutoloadNamespaces is a new feature in 1.31 Change-Id: I27f49f67c1c27b022b94aa5d76c064c30ec4762a --- M extension.json 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints refs/changes/82/401182/1 diff --git a/extension.json b/extension.json index 38cfa6c..7be24ea 100644 --- a/extension.json +++ b/extension.json @@ -7,6 +7,9 @@ "version": "1.0.0", "license-name": "GPL-2.0+", "type": "wikibase", + "requires": { + "MediaWiki": ">= 1.31.0" + }, "MessagesDirs": { "WikibaseQualityConstraints": [ "i18n" -- To view, visit https://gerrit.wikimedia.org/r/401182 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I27f49f67c1c27b022b94aa5d76c064c30ec4762a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix typo in word "callback"
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401177 ) Change subject: Fix typo in word "callback" .. Fix typo in word "callback" Change-Id: If47b9d80df4189317ec41998b35546a6118288c2 --- M includes/config/ConfigFactory.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/config/ConfigFactory.php b/includes/config/ConfigFactory.php index cd25352..e175765 100644 --- a/includes/config/ConfigFactory.php +++ b/includes/config/ConfigFactory.php @@ -99,7 +99,7 @@ * Will override if it's already registered. * Use "*" for $name to provide a fallback config for all unknown names. * @param string $name -* @param callable|Config $callback A factory callabck that takes this ConfigFactory +* @param callable|Config $callback A factory callback that takes this ConfigFactory *as an argument and returns a Config instance, or an existing Config instance. * @throws InvalidArgumentException If an invalid callback is provided */ -- To view, visit https://gerrit.wikimedia.org/r/401177 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If47b9d80df4189317ec41998b35546a6118288c2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender 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] pywikibot/core[master]: [TEST] Add Test for site.botusers() method
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401083 ) Change subject: [TEST] Add Test for site.botusers() method .. [TEST] Add Test for site.botusers() method Added test for the site.botusers() method, as my GCI task. Bug: T60941 Change-Id: I066eecb25358ae054d7abc925574550153a83a6a --- M tests/site_tests.py 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/site_tests.py b/tests/site_tests.py index bd77485..b0f7287 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -749,6 +749,18 @@ self.assertIsInstance(cat, pywikibot.Category) self.assertLessEqual(cat.title(withNamespace=False), "Hij") +def test_botusers(self): +"""Test the site.botusers() method.""" +mysite = self.get_site() +bu = list(mysite.botusers(total=10)) +self.assertLessEqual(len(bu), 10) +for botuser in bu: +self.assertIsInstance(botuser, dict) +self.assertIn('name', botuser) +self.assertIn('userid', botuser) +self.assertIn('editcount', botuser) +self.assertIn('registration', botuser) + def test_allusers(self): """Test the site.allusers() method.""" mysite = self.get_site() -- To view, visit https://gerrit.wikimedia.org/r/401083 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I066eecb25358ae054d7abc925574550153a83a6a Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Anpans Gerrit-Reviewer: Anpans Gerrit-Reviewer: Framawiki Gerrit-Reviewer: John Vandenberg Gerrit-Reviewer: Xqt Gerrit-Reviewer: Zoranzoki21 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...Kartographer[master]: Require MediaWiki 1.31 in extension.json for AutoloadNamespaces
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401179 ) Change subject: Require MediaWiki 1.31 in extension.json for AutoloadNamespaces .. Require MediaWiki 1.31 in extension.json for AutoloadNamespaces AutoloadNamespaces is a new feature in 1.31 Change-Id: Ife195aa2c0a6254b518206fe758be100f116fb2b --- M extension.json 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer refs/changes/79/401179/1 diff --git a/extension.json b/extension.json index 1bfae5d..1722339 100644 --- a/extension.json +++ b/extension.json @@ -10,6 +10,9 @@ "descriptionmsg": "kartographer-desc", "license-name": "MIT", "type": "other", + "requires": { + "MediaWiki": ">= 1.31.0" + }, "MessagesDirs": { "Kartographer": [ "i18n", -- To view, visit https://gerrit.wikimedia.org/r/401179 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ife195aa2c0a6254b518206fe758be100f116fb2b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Kartographer Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Linter[master]: Require MediaWiki 1.31 in extension.json for AutoloadNamespaces
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401180 ) Change subject: Require MediaWiki 1.31 in extension.json for AutoloadNamespaces .. Require MediaWiki 1.31 in extension.json for AutoloadNamespaces AutoloadNamespaces is a new feature in 1.31 Change-Id: If877db9d628598f3d91a55b767be421cfa8a50b1 --- M extension.json 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Linter refs/changes/80/401180/1 diff --git a/extension.json b/extension.json index e6c742c..4ad3f8a 100644 --- a/extension.json +++ b/extension.json @@ -9,6 +9,9 @@ ], "descriptionmsg": "linter-desc", "type": "specialpage", + "requires": { + "MediaWiki": ">= 1.31.0" + }, "AutoloadNamespaces": { "MediaWiki\\Linter\\": "includes/" }, -- To view, visit https://gerrit.wikimedia.org/r/401180 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If877db9d628598f3d91a55b767be421cfa8a50b1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Linter Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics...WDCM-GeoDashboard[master]: initial
GoranSMilovanovic has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401178 ) Change subject: initial .. initial Change-Id: Ie9b6a717f2203ab428fecc4518cdc057ef90882f --- A .gitignore A server.R A ui.R 3 files changed, 370 insertions(+), 0 deletions(-) Approvals: GoranSMilovanovic: Verified; Looks good to me, approved diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..c23da9e --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +**/data +**/www +**/update + diff --git a/server.R b/server.R new file mode 100644 index 000..58191de --- /dev/null +++ b/server.R @@ -0,0 +1,143 @@ +### --- +### --- WDCM Geo Dashboard, v. Beta 0.1 +### --- Script: server.R, v. Beta 0.1 +### --- + +### --- Setup + +### +### --- general +library(shiny) +library(shinydashboard) +library(data.table) +library(DT) +library(stringr) +### --- visualize +library(leaflet) + +### --- Server (Session) Scope +### + +### --- Fetch local files +setwd('/srv/shiny-server/WDCM_GeoDashboard/data/') + +### --- fetch projecttopic tables +lF <- list.files() +lF <- lF[grepl("^wdcm_geoitem_", lF)] +categories <- vector(mode = "list", length = length(lF)) +for (i in 1:length(lF)) { + categories[[i]] <- fread(lF[i], data.table = F) +} +names(categories) <- str_to_title(sapply(lF, function(x) { + strsplit(strsplit(x, split = ".", fixed = T)[[1]][1], + split = "_", + fixed = T)[[1]][3] +})) + + +### --- Fetch update info +setwd('/srv/shiny-server/WDCM_GeoDashboard/update/') +update <- read.csv('toLabsGeoReport.csv', + header = T, + check.names = F, + stringsAsFactors = F, + row.names = 1) + +### --- shinyServer +shinyServer(function(input, output, session) { + + ### --- output: updateInfo + output$updateInfo <- renderText({ +date <- update$timeStamp[dim(update)[1]] +date <- strsplit(as.character(date), split = " ", fixed = T)[[1]][1] +date <- strsplit(date, split = "-", fixed = T) +date[[1]][2] <- month.name[as.numeric(date[[1]][2])] +date <- paste(unlist(date), collapse = " ") +return(paste("Last update: ", date, "", sep = "")) + }) + + ### -- + ### --- TAB: tabPanel Maps + ### -- + + ### --- SELECT: update select 'selectCategory' + updateSelectizeInput(session, + 'selectCategory', + "Select Semantic Category:", + choices = names(categories), + selected = names(categories)[round(runif(1, 1, length(categories)))], + server = TRUE) + + ### --- LEAFLET MAP: + points <- eventReactive(input$selectCategory, { +if (is.null(input$selectCategory) | (input$selectCategory == "")) { + return(NULL) +} else { + outCat <- categories[[which(names(categories) %in% input$selectCategory)]] + outCat[, 2:dim(outCat)[2]] +} + }, ignoreNULL = FALSE) + + output$wdcmMap <- renderLeaflet({ +if (is.null(points())) { + return(NULL) +} else { + leaflet() %>% +addTiles() %>% +addMarkers(data = points(), + popup = (paste('', points()$label, '', + 'https://www.wikidata.org/wiki/', points()$item, '" target = "_blank">', points()$item, '', + 'Usage: ', points()$usage, sep = "") +), + clusterOptions = markerClusterOptions() + ) +} +}) %>% withProgress(message = 'Generating map', + min = 0, + max = 1, + value = 1, {incProgress(amount = 1)}) + + ### -- + ### --- TAB: tabPanel Data + ### -- + + ### --- output$mapData + output$mapData <- DT::renderDataTable({ +datatable(points(), + options = list( +pageLength = 20, +width = '100%', +columnDefs = list(list(className = 'dt-center', targets = "_all")) + ), + rownames = FALSE +) + }) %>% withProgress(message = 'Generating data', + min = 0, + max = 1, + value = 1, {incProgress(amount = 1)}) + + ### --- download map data + # - Download: tabulations_projectsChart + output$mapDataCSV <- downloadHandler( +filename = function() { + 'WDCM_Data.csv'}, +content = function(file) { + write.csv(points(), +file, +quote = FALSE, +
[MediaWiki-commits] [Gerrit] analytics...WDCM-GeoDashboard[master]: initial
GoranSMilovanovic has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401178 ) Change subject: initial .. initial Change-Id: Ie9b6a717f2203ab428fecc4518cdc057ef90882f --- A .gitignore A server.R A ui.R 3 files changed, 370 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/wmde/WDCM-GeoDashboard refs/changes/78/401178/1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..c23da9e --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +**/data +**/www +**/update + diff --git a/server.R b/server.R new file mode 100644 index 000..58191de --- /dev/null +++ b/server.R @@ -0,0 +1,143 @@ +### --- +### --- WDCM Geo Dashboard, v. Beta 0.1 +### --- Script: server.R, v. Beta 0.1 +### --- + +### --- Setup + +### +### --- general +library(shiny) +library(shinydashboard) +library(data.table) +library(DT) +library(stringr) +### --- visualize +library(leaflet) + +### --- Server (Session) Scope +### + +### --- Fetch local files +setwd('/srv/shiny-server/WDCM_GeoDashboard/data/') + +### --- fetch projecttopic tables +lF <- list.files() +lF <- lF[grepl("^wdcm_geoitem_", lF)] +categories <- vector(mode = "list", length = length(lF)) +for (i in 1:length(lF)) { + categories[[i]] <- fread(lF[i], data.table = F) +} +names(categories) <- str_to_title(sapply(lF, function(x) { + strsplit(strsplit(x, split = ".", fixed = T)[[1]][1], + split = "_", + fixed = T)[[1]][3] +})) + + +### --- Fetch update info +setwd('/srv/shiny-server/WDCM_GeoDashboard/update/') +update <- read.csv('toLabsGeoReport.csv', + header = T, + check.names = F, + stringsAsFactors = F, + row.names = 1) + +### --- shinyServer +shinyServer(function(input, output, session) { + + ### --- output: updateInfo + output$updateInfo <- renderText({ +date <- update$timeStamp[dim(update)[1]] +date <- strsplit(as.character(date), split = " ", fixed = T)[[1]][1] +date <- strsplit(date, split = "-", fixed = T) +date[[1]][2] <- month.name[as.numeric(date[[1]][2])] +date <- paste(unlist(date), collapse = " ") +return(paste("Last update: ", date, "", sep = "")) + }) + + ### -- + ### --- TAB: tabPanel Maps + ### -- + + ### --- SELECT: update select 'selectCategory' + updateSelectizeInput(session, + 'selectCategory', + "Select Semantic Category:", + choices = names(categories), + selected = names(categories)[round(runif(1, 1, length(categories)))], + server = TRUE) + + ### --- LEAFLET MAP: + points <- eventReactive(input$selectCategory, { +if (is.null(input$selectCategory) | (input$selectCategory == "")) { + return(NULL) +} else { + outCat <- categories[[which(names(categories) %in% input$selectCategory)]] + outCat[, 2:dim(outCat)[2]] +} + }, ignoreNULL = FALSE) + + output$wdcmMap <- renderLeaflet({ +if (is.null(points())) { + return(NULL) +} else { + leaflet() %>% +addTiles() %>% +addMarkers(data = points(), + popup = (paste('', points()$label, '', + 'https://www.wikidata.org/wiki/', points()$item, '" target = "_blank">', points()$item, '', + 'Usage: ', points()$usage, sep = "") +), + clusterOptions = markerClusterOptions() + ) +} +}) %>% withProgress(message = 'Generating map', + min = 0, + max = 1, + value = 1, {incProgress(amount = 1)}) + + ### -- + ### --- TAB: tabPanel Data + ### -- + + ### --- output$mapData + output$mapData <- DT::renderDataTable({ +datatable(points(), + options = list( +pageLength = 20, +width = '100%', +columnDefs = list(list(className = 'dt-center', targets = "_all")) + ), + rownames = FALSE +) + }) %>% withProgress(message = 'Generating data', + min = 0, + max = 1, + value = 1, {incProgress(amount = 1)}) + + ### --- download map data + # - Download: tabulations_projectsChart + output$mapDataCSV <- downloadHandler( +filename = function() { + 'WDCM_Data.csv'}, +content = function(file) { + write.csv(points(), +file, +
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix typo in word "callback"
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401177 ) Change subject: Fix typo in word "callback" .. Fix typo in word "callback" Change-Id: If47b9d80df4189317ec41998b35546a6118288c2 --- M includes/config/ConfigFactory.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/77/401177/1 diff --git a/includes/config/ConfigFactory.php b/includes/config/ConfigFactory.php index cd25352..e175765 100644 --- a/includes/config/ConfigFactory.php +++ b/includes/config/ConfigFactory.php @@ -99,7 +99,7 @@ * Will override if it's already registered. * Use "*" for $name to provide a fallback config for all unknown names. * @param string $name -* @param callable|Config $callback A factory callabck that takes this ConfigFactory +* @param callable|Config $callback A factory callback that takes this ConfigFactory *as an argument and returns a Config instance, or an existing Config instance. * @throws InvalidArgumentException If an invalid callback is provided */ -- To view, visit https://gerrit.wikimedia.org/r/401177 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If47b9d80df4189317ec41998b35546a6118288c2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Fix bug that causes newsletter names in database to contain ...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401114 ) Change subject: Fix bug that causes newsletter names in database to contain namespace name .. Fix bug that causes newsletter names in database to contain namespace name This was introduced by mistake in 39eac922ee889f67d8ba0de97d2c80fc09e41db2 Bug: T183752 Change-Id: I544a3034c7f25132d9916fe99bde0791a7c1a6fa --- M includes/content/NewsletterDataUpdate.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: 01tonythomas: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/content/NewsletterDataUpdate.php b/includes/content/NewsletterDataUpdate.php index 4df676d..ee5dc86 100644 --- a/includes/content/NewsletterDataUpdate.php +++ b/includes/content/NewsletterDataUpdate.php @@ -81,7 +81,7 @@ $newsletter = Newsletter::newFromName( $this->title->getText() ); $formData = [ - 'Name' => $this->title->getFullText(), + 'Name' => $this->title->getText(), 'Description' => $this->content->getDescription(), 'MainPage' => $this->content->getMainPage() ]; -- To view, visit https://gerrit.wikimedia.org/r/401114 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I544a3034c7f25132d9916fe99bde0791a7c1a6fa Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Newsletter Gerrit-Branch: master Gerrit-Owner: Pppery Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com> Gerrit-Reviewer: Addshore 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...MultiLanguageManager[master]: Use MediaWiki PSR-4 autoloader
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401176 ) Change subject: Use MediaWiki PSR-4 autoloader .. Use MediaWiki PSR-4 autoloader Move from composer autoload to MediaWiki autoload will fix tests, because the no-composer tests are running on this extension Change-Id: I7baa533da64fcb7d91e362a1c57c0e31365a899b --- M composer.json M extension.json 2 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultiLanguageManager refs/changes/76/401176/1 diff --git a/composer.json b/composer.json index 4fefbef..6197711 100644 --- a/composer.json +++ b/composer.json @@ -5,12 +5,6 @@ "require": { "composer/installers": "~1.0" }, - "autoload": { - "psr-4": { - "MultiLanguageManager\\Tests\\": "tests/phpunit", - "MultiLanguageManager\\": "src" - } - }, "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", "jakub-onderka/php-console-highlighter": "0.3.2", diff --git a/extension.json b/extension.json index e290295..8714595 100644 --- a/extension.json +++ b/extension.json @@ -10,6 +10,9 @@ "descriptionmsg": "mlm-desc", "license-name": "GPL-2.0", "type": "other", + "requires": { + "MediaWiki": ">= 1.31.0" + }, "MessagesDirs": { "MultiLanguageManager": [ "i18n" @@ -101,6 +104,9 @@ "value": "MultiLanguageManager" } }, - "load_composer_autoloader" : true, + "AutoloadNamespaces": { + "MultiLanguageManager\\Tests\\": "tests/phpunit", + "MultiLanguageManager\\": "src" + }, "manifest_version": 2 } -- To view, visit https://gerrit.wikimedia.org/r/401176 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7baa533da64fcb7d91e362a1c57c0e31365a899b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MultiLanguageManager Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Form[master]: Add missing qqq message documentation
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401175 ) Change subject: Add missing qqq message documentation .. Add missing qqq message documentation Enable banana checker Change-Id: I13008d3f1848150110916b3a110aff73dca66387 --- M Gruntfile.js M i18n/qqq.json 2 files changed, 24 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Form refs/changes/75/401175/1 diff --git a/Gruntfile.js b/Gruntfile.js index 47d544d..ea67e84 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,10 +1,10 @@ module.exports = function ( grunt ) { grunt.loadNpmTasks( 'grunt-jsonlint' ); -// grunt.loadNpmTasks( 'grunt-banana-checker' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); -// var conf = grunt.file.readJSON( 'extension.json' ); + var conf = grunt.file.readJSON( 'extension.json' ); grunt.initConfig( { -// banana: conf.MessagesDirs, + banana: conf.MessagesDirs, jsonlint: { all: [ '**/*.json', @@ -14,6 +14,6 @@ } } ); - grunt.registerTask( 'test', [ 'jsonlint'/*, 'banana'*/ ] ); + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); grunt.registerTask( 'default', 'test' ); }; diff --git a/i18n/qqq.json b/i18n/qqq.json index 0bc5e13..eeac5dc 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -8,8 +8,26 @@ "The Evil IP address" ] }, - "form-desc": "{{desc}}", + "form-desc": "{{desc|name=Form|url=https://www.mediawiki.org/wiki/Extension:Form}}";, + "form": "{{doc-special}}", + "form-captcha-error": "An error message", + "form-pick-form": "A description message", + "form-no-name": "Used as page title", + "form-no-name-text": "An error message", + "form-bad-name": "Used as page title", + "form-bad-name-text": "An error message", "form-pattern": "The pattern of page names of form definitions. $1 is a given name for a form definition.", + "form-template-pattern": "{{notranslate}}", + "form-title-pattern": "Used as default title for an empty form", "form-save": "{{Identical|Save}}", - "form-required-field-error": "* $1 is a comma separated list of missing fields\n* $2 is the number of missing fields" + "form-index-mismatch-title": "Used as page title", + "form-index-mismatch": "An error message", + "form-article-exists": "Used as page title", + "form-article-existstext": "form-article-exists", + "form-bad-page-name": "Used as page title", + "form-bad-page-name-text": "An error message", + "form-required-field-error": "An error message\n* $1 is a comma separated list of missing fields\n* $2 is the number of missing fields", + "form-save-summary": "An edit summary", + "form-save-error": "Used as page title", + "form-save-error-text": "An error message" } -- To view, visit https://gerrit.wikimedia.org/r/401175 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I13008d3f1848150110916b3a110aff73dca66387 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Form Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SphinxSearch[master]: Fix path error in sphinxapi.php loading
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401112 ) Change subject: Fix path error in sphinxapi.php loading .. Fix path error in sphinxapi.php loading Commit 3837675 introduced falling back on loading sphinxapi.php from the extension directory if the extension wasn't installed with composer. However, it missed a necessary / in the path. This patch fixes this. Change-Id: I09bec64b1a3cae05982dec9901e8ad719152835d --- M SphinxSearch.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Umherirrender: Looks good to me, approved jenkins-bot: Verified diff --git a/SphinxSearch.php b/SphinxSearch.php index 0e812e5..c22796a 100644 --- a/SphinxSearch.php +++ b/SphinxSearch.php @@ -50,7 +50,7 @@ # installation folder to your SphinxSearch extension folder # not needed if you install http://pecl.php.net/package/sphinx if ( !class_exists( 'SphinxClient' ) ) { - require_once ( __DIR__. 'sphinxapi.php' ); + require_once ( __DIR__ . '/sphinxapi.php' ); } # Host and port on which searchd deamon is running -- To view, visit https://gerrit.wikimedia.org/r/401112 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I09bec64b1a3cae05982dec9901e8ad719152835d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SphinxSearch Gerrit-Branch: master Gerrit-Owner: Notartom Gerrit-Reviewer: Umherirrender 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]: Add Translation NS for kowikisource
Revi has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401174 ) Change subject: Add Translation NS for kowikisource .. Add Translation NS for kowikisource Add 번역 and 번역토론 (respectively Translation and Translation_talk in English) to kowikisource, and add them to content NS, and let them be searched by default. Fixes T183836. Bug: T183836 Change-Id: I275914c610ce5b3ef1502d84a7d611f6f4708180 Signed-off-by: Yongmin Hong --- M wmf-config/InitialiseSettings.php 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/74/401174/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 7c00204..6cef332 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -6288,6 +6288,8 @@ 101 => '저자토론', 102 => '포털', // T71522 103 => '포털토론', + 114 => '번역', // T183836, Translation + 115 => '번역토론', // T183836, Traslation talk ], 'lawikisource' => [ 102 => 'Scriptor', @@ -7731,7 +7733,7 @@ '+itwikisource' => [ 102 => 1, 110 => 1 ], '+itwikiversity' => [ 100 => 1, 102 => 1, 104 => 1 ], // T114932 '+itwikivoyage' => [ 100 => 1, 104 => 1, 106 => 1 ], - '+kowikisource' => [ 100 => 1 ], + '+kowikisource' => [ 100 => 1, 114 => 1 ], // T183836 for 114 '+lawikisource' => [ 102 => 1, 106 => 1 ], '+wikitech' => [ 12 => 1, 116 => 1, 498 => 1 ], '+ltwiki' => [ 100 => 1 ], @@ -12065,7 +12067,7 @@ '+idwikisource' => [ 100 ], '+itwikisource' => [ 102 ], '+itwikivoyage' => [ 100, 104 ], // T57620 - '+kowikisource' => [ 100 ], + '+kowikisource' => [ 100, 114 ], // T183836 for 114 '+lawikisource' => [ 102 ], '+ltwikipedia' => [ 104 ], // T144118 '+mediawikiwiki' => [ 100, 102, 104, 106 ], // Manuals, extensions, Api & skin - T86391 -- To view, visit https://gerrit.wikimedia.org/r/401174 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I275914c610ce5b3ef1502d84a7d611f6f4708180 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Revi ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceArticleInfo[master]: Use always tabs in composer.json
Umherirrender has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401101 ) Change subject: Use always tabs in composer.json .. Use always tabs in composer.json Change-Id: I6d825cc3d2f18ccc5b043aa8918c716fc646107a --- M composer.json 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Umherirrender: Verified; Looks good to me, approved diff --git a/composer.json b/composer.json index 2a8e6d1..2f76760 100644 --- a/composer.json +++ b/composer.json @@ -13,12 +13,12 @@ "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", "jakub-onderka/php-console-highlighter": "0.3.2", -"mediawiki/minus-x": "0.2.1" + "mediawiki/minus-x": "0.2.1" }, "scripts": { "test": [ "parallel-lint . --exclude vendor --exclude node_modules", - "minus-x check ." + "minus-x check ." ], "fix": [ "minus-x fix ." -- To view, visit https://gerrit.wikimedia.org/r/401101 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6d825cc3d2f18ccc5b043aa8918c716fc646107a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceArticleInfo Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Ljonka Gerrit-Reviewer: Mglaser Gerrit-Reviewer: Pwirth Gerrit-Reviewer: Robert Vogel Gerrit-Reviewer: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceAuthors[master]: Use always tabs in composer.json
Umherirrender has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401100 ) Change subject: Use always tabs in composer.json .. Use always tabs in composer.json Change-Id: I8fe53f0449ac0362888f4ddd18ccc741e59eda2e --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Umherirrender: Verified; Looks good to me, approved diff --git a/composer.json b/composer.json index 867ac62..b3ad822 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", "jakub-onderka/php-console-highlighter": "0.3.2", - "mediawiki/minus-x": "0.2.1" + "mediawiki/minus-x": "0.2.1" }, "scripts": { "test": [ -- To view, visit https://gerrit.wikimedia.org/r/401100 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8fe53f0449ac0362888f4ddd18ccc741e59eda2e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceAuthors Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Ljonka Gerrit-Reviewer: Mglaser Gerrit-Reviewer: Pwirth Gerrit-Reviewer: Robert Vogel Gerrit-Reviewer: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceUsageTracker[master]: Add grunt-jsonlint and grunt-banana-checker
Umherirrender has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401172 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Always use tabs in composer.json Change-Id: I76cd89170994584a1bf07c4ac3275f3723edd55c --- A Gruntfile.js M composer.json A package.json 3 files changed, 31 insertions(+), 1 deletion(-) Approvals: Umherirrender: Verified; Looks good to me, approved diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ea67e84 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json index 8d92ad6..21a4bda 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ }, "scripts": { "test": [ - "parallel-lint . --exclude vendor --exclude node_modules" + "parallel-lint . --exclude vendor --exclude node_modules" ] }, "autoload" : { diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/401172 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I76cd89170994584a1bf07c4ac3275f3723edd55c Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/BlueSpiceUsageTracker Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Ljonka Gerrit-Reviewer: Mglaser Gerrit-Reviewer: Pwirth Gerrit-Reviewer: Robert Vogel Gerrit-Reviewer: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceSaferEdit[master]: Add grunt-jsonlint and grunt-banana-checker
Umherirrender has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401169 ) Change subject: Add grunt-jsonlint and grunt-banana-checker .. Add grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files Always use tabs in composer.json Change-Id: Ia4910827b5e7c5cb16e7fa0925a438b25b7c023e --- A Gruntfile.js M composer.json A package.json 3 files changed, 38 insertions(+), 8 deletions(-) Approvals: Umherirrender: Verified; Looks good to me, approved diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ea67e84 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json index b9ea082..7a568dc 100644 --- a/composer.json +++ b/composer.json @@ -6,14 +6,14 @@ "require": { "composer/installers": "~1.0" }, -"require-dev": { -"jakub-onderka/php-parallel-lint": "0.9.2", -"jakub-onderka/php-console-highlighter": "0.3.2" -}, -"scripts": { -"test": [ -"parallel-lint . --exclude vendor --exclude node_modules" -] + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.2", + "jakub-onderka/php-console-highlighter": "0.3.2" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor --exclude node_modules" + ] }, "autoload" : { "files": [ "SaferEdit.class.php" ], diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/401169 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia4910827b5e7c5cb16e7fa0925a438b25b7c023e Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/BlueSpiceSaferEdit Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Ljonka Gerrit-Reviewer: Mglaser Gerrit-Reviewer: Pwirth Gerrit-Reviewer: Robert Vogel Gerrit-Reviewer: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceUniversalExport[master]: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker
Umherirrender has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401171 ) Change subject: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker .. Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files php-lint will test for valid php files Change-Id: Ieca425883914e82f789c4c84572007ce23106316 --- A Gruntfile.js M composer.json A package.json 3 files changed, 39 insertions(+), 0 deletions(-) Approvals: Umherirrender: Verified; Looks good to me, approved diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ea67e84 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json index 91ee2be..d25cf06 100644 --- a/composer.json +++ b/composer.json @@ -5,5 +5,14 @@ "license": "GPL-3.0", "require": { "composer/installers": "~1.0" + }, + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.2", + "jakub-onderka/php-console-highlighter": "0.3.2" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor --exclude node_modules" + ] } } diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/401171 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieca425883914e82f789c4c84572007ce23106316 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceUniversalExport Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Ljonka Gerrit-Reviewer: Mglaser Gerrit-Reviewer: Pwirth Gerrit-Reviewer: Robert Vogel Gerrit-Reviewer: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceUEModulePDF[master]: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker
Umherirrender has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401170 ) Change subject: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker .. Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files php-lint will test for valid php files Change-Id: Ic17077d94b4a8b8e6e073527e22c924dd0314a13 --- A Gruntfile.js M composer.json A package.json 3 files changed, 39 insertions(+), 0 deletions(-) Approvals: Umherirrender: Verified; Looks good to me, approved diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ea67e84 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json index f799580..2772d0d 100644 --- a/composer.json +++ b/composer.json @@ -5,5 +5,14 @@ "license": "GPL-3.0", "require": { "composer/installers": "~1.0" + }, + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.2", + "jakub-onderka/php-console-highlighter": "0.3.2" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor --exclude node_modules" + ] } } diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/401170 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic17077d94b4a8b8e6e073527e22c924dd0314a13 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceUEModulePDF Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Ljonka Gerrit-Reviewer: Mglaser Gerrit-Reviewer: Pwirth Gerrit-Reviewer: Robert Vogel Gerrit-Reviewer: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpicePageAccess[master]: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker
Umherirrender has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401168 ) Change subject: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker .. Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files php-lint will test for valid php files Change-Id: Ifd76fada63adbde6c84fed1c24faded11884636f --- A Gruntfile.js M composer.json A package.json 3 files changed, 39 insertions(+), 0 deletions(-) Approvals: Umherirrender: Verified; Looks good to me, approved diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ea67e84 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json index 680df45..b60d3fa 100644 --- a/composer.json +++ b/composer.json @@ -6,6 +6,15 @@ "require": { "composer/installers": "~1.0" }, + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.2", + "jakub-onderka/php-console-highlighter": "0.3.2" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor --exclude node_modules" + ] + }, "autoload" : { "psr-4": { "BlueSpice\\PageAccess\\" : "src", diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/401168 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifd76fada63adbde6c84fed1c24faded11884636f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpicePageAccess Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Ljonka Gerrit-Reviewer: Mglaser Gerrit-Reviewer: Pwirth Gerrit-Reviewer: Robert Vogel Gerrit-Reviewer: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceNamespaceCSS[master]: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker
Umherirrender has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401167 ) Change subject: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker .. Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files php-lint will test for valid php files Change-Id: Ic7ef5cda0d3480a77b669af8df65d29ee4a53327 --- A Gruntfile.js M composer.json A package.json 3 files changed, 39 insertions(+), 0 deletions(-) Approvals: Umherirrender: Verified; Looks good to me, approved diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ea67e84 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json index 77c5577..b6eb128 100644 --- a/composer.json +++ b/composer.json @@ -6,6 +6,15 @@ "require": { "composer/installers": "~1.0" }, + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.2", + "jakub-onderka/php-console-highlighter": "0.3.2" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor --exclude node_modules" + ] + }, "autoload": { "psr-4": { } diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/401167 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic7ef5cda0d3480a77b669af8df65d29ee4a53327 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceNamespaceCSS Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Ljonka Gerrit-Reviewer: Mglaser Gerrit-Reviewer: Pwirth Gerrit-Reviewer: Robert Vogel Gerrit-Reviewer: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceInsertMagic[master]: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker
Umherirrender has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401166 ) Change subject: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker .. Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files php-lint will test for valid php files Change-Id: Ib3a57a12d49a62031ef3e3255d2663c8c0d73e33 --- A Gruntfile.js M composer.json A package.json 3 files changed, 39 insertions(+), 0 deletions(-) Approvals: Umherirrender: Verified; Looks good to me, approved diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ea67e84 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json index 018bf12..caab47a 100644 --- a/composer.json +++ b/composer.json @@ -6,6 +6,15 @@ "require": { "composer/installers": "~1.0" }, + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.2", + "jakub-onderka/php-console-highlighter": "0.3.2" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor --exclude node_modules" + ] + }, "autoload": { "psr-4": { } diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/401166 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib3a57a12d49a62031ef3e3255d2663c8c0d73e33 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceInsertMagic Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Ljonka Gerrit-Reviewer: Mglaser Gerrit-Reviewer: Pwirth Gerrit-Reviewer: Robert Vogel Gerrit-Reviewer: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceInsertLink[master]: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker
Umherirrender has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401165 ) Change subject: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker .. Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files php-lint will test for valid php files Change-Id: I63cfd2a8778e0fb7b98608279716a85c1ddaef45 --- M .gitignore A Gruntfile.js M composer.json A package.json 4 files changed, 42 insertions(+), 1 deletion(-) Approvals: Umherirrender: Verified; Looks good to me, approved diff --git a/.gitignore b/.gitignore index 463cbe5..553a300 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,9 @@ *.kate-swp *.swp node_modules/** -vendor/composer/** +vendor/** +!vendor/src/** +!vendor/bsFileLinkChooser.jar composer.lock composer.phar diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ea67e84 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json index 27e4ea2..d31c959 100644 --- a/composer.json +++ b/composer.json @@ -6,6 +6,15 @@ "require": { "composer/installers": "~1.0" }, + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.2", + "jakub-onderka/php-console-highlighter": "0.3.2" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor --exclude node_modules" + ] + }, "autoload": { "psr-4": { } diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/401165 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I63cfd2a8778e0fb7b98608279716a85c1ddaef45 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceInsertLink Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Ljonka Gerrit-Reviewer: Mglaser Gerrit-Reviewer: Pwirth Gerrit-Reviewer: Robert Vogel Gerrit-Reviewer: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceInsertCategory[master]: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker
Umherirrender has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401163 ) Change subject: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker .. Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files php-lint will test for valid php files Change-Id: I9c772f737e0e75bca953bf0cbbda00c347ef08d0 --- A Gruntfile.js M composer.json A package.json 3 files changed, 39 insertions(+), 0 deletions(-) Approvals: Umherirrender: Verified; Looks good to me, approved diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ea67e84 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json index e6bc2ff..c05e502 100644 --- a/composer.json +++ b/composer.json @@ -6,6 +6,15 @@ "require": { "composer/installers": "~1.0" }, + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.2", + "jakub-onderka/php-console-highlighter": "0.3.2" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor --exclude node_modules" + ] + }, "autoload": { "psr-4": { } diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/401163 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9c772f737e0e75bca953bf0cbbda00c347ef08d0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceInsertCategory Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Ljonka Gerrit-Reviewer: Mglaser Gerrit-Reviewer: Pwirth Gerrit-Reviewer: Robert Vogel Gerrit-Reviewer: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceHideTitle[master]: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker
Umherirrender has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401173 ) Change subject: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker .. Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files php-lint will test for valid php files Change-Id: I185367eac533c1972bf961d1e2b0dce0c1e3b603 --- A Gruntfile.js M composer.json A package.json 3 files changed, 39 insertions(+), 0 deletions(-) Approvals: Umherirrender: Verified; Looks good to me, approved diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ea67e84 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json index 0ebe8cf..7a312a6 100644 --- a/composer.json +++ b/composer.json @@ -6,6 +6,15 @@ "require": { "composer/installers": "~1.0" }, + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.2", + "jakub-onderka/php-console-highlighter": "0.3.2" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor --exclude node_modules" + ] + }, "autoload": { "psr-4": { } diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/401173 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I185367eac533c1972bf961d1e2b0dce0c1e3b603 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceHideTitle Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Ljonka Gerrit-Reviewer: Mglaser Gerrit-Reviewer: Pwirth Gerrit-Reviewer: Robert Vogel Gerrit-Reviewer: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceInsertFile[master]: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker
Umherirrender has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401164 ) Change subject: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker .. Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files php-lint will test for valid php files Change-Id: I1124a9ca33c68388689090dc9580f63e015833ab --- A Gruntfile.js M composer.json A package.json 3 files changed, 39 insertions(+), 0 deletions(-) Approvals: Umherirrender: Verified; Looks good to me, approved diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ea67e84 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json index fce3012..fe0ab43 100644 --- a/composer.json +++ b/composer.json @@ -6,6 +6,15 @@ "require": { "composer/installers": "~1.0" }, + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.2", + "jakub-onderka/php-console-highlighter": "0.3.2" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor --exclude node_modules" + ] + }, "autoload": { "psr-4": { } diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/401164 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1124a9ca33c68388689090dc9580f63e015833ab Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceInsertFile Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Ljonka Gerrit-Reviewer: Mglaser Gerrit-Reviewer: Pwirth Gerrit-Reviewer: Robert Vogel Gerrit-Reviewer: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceHideTitle[master]: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401173 ) Change subject: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker .. Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files php-lint will test for valid php files Change-Id: I185367eac533c1972bf961d1e2b0dce0c1e3b603 --- A Gruntfile.js M composer.json A package.json 3 files changed, 39 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceHideTitle refs/changes/73/401173/1 diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ea67e84 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json index 0ebe8cf..7a312a6 100644 --- a/composer.json +++ b/composer.json @@ -6,6 +6,15 @@ "require": { "composer/installers": "~1.0" }, + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.2", + "jakub-onderka/php-console-highlighter": "0.3.2" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor --exclude node_modules" + ] + }, "autoload": { "psr-4": { } diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/401173 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I185367eac533c1972bf961d1e2b0dce0c1e3b603 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceHideTitle Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Form[master]: Add php-parallel-lint and grunt-jsonlint
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401162 ) Change subject: Add php-parallel-lint and grunt-jsonlint .. Add php-parallel-lint and grunt-jsonlint jsonlint will test for valid i18n files php-lint will test for valid php files Change-Id: I27b0d36c1ba2ba05708401bbff5694f0ec0d6f2a --- A .gitignore A Gruntfile.js A composer.json A package.json 4 files changed, 44 insertions(+), 0 deletions(-) Approvals: Umherirrender: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..db8a779 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/node_modules +/vendor +/composer.lock diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..47d544d --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); +// grunt.loadNpmTasks( 'grunt-banana-checker' ); + +// var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { +// banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint'/*, 'banana'*/ ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json new file mode 100644 index 000..aebd773 --- /dev/null +++ b/composer.json @@ -0,0 +1,11 @@ +{ + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.2", + "jakub-onderka/php-console-highlighter": "0.3.2" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor --exclude node_modules" + ] + } +} diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/401162 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I27b0d36c1ba2ba05708401bbff5694f0ec0d6f2a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Form Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Umherirrender 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...BlueSpiceUsageTracker[master]: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401172 ) Change subject: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker .. Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files php-lint will test for valid php files Change-Id: I76cd89170994584a1bf07c4ac3275f3723edd55c --- A Gruntfile.js M composer.json A package.json 3 files changed, 31 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceUsageTracker refs/changes/72/401172/1 diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ea67e84 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json index 8d92ad6..21a4bda 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ }, "scripts": { "test": [ - "parallel-lint . --exclude vendor --exclude node_modules" + "parallel-lint . --exclude vendor --exclude node_modules" ] }, "autoload" : { diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/401172 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I76cd89170994584a1bf07c4ac3275f3723edd55c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceUsageTracker Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceUniversalExport[master]: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401171 ) Change subject: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker .. Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files php-lint will test for valid php files Change-Id: Ieca425883914e82f789c4c84572007ce23106316 --- A Gruntfile.js M composer.json A package.json 3 files changed, 39 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceUniversalExport refs/changes/71/401171/1 diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ea67e84 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json index 91ee2be..d25cf06 100644 --- a/composer.json +++ b/composer.json @@ -5,5 +5,14 @@ "license": "GPL-3.0", "require": { "composer/installers": "~1.0" + }, + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.2", + "jakub-onderka/php-console-highlighter": "0.3.2" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor --exclude node_modules" + ] } } diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/401171 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieca425883914e82f789c4c84572007ce23106316 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceUniversalExport Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceUEModulePDF[master]: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401170 ) Change subject: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker .. Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files php-lint will test for valid php files Change-Id: Ic17077d94b4a8b8e6e073527e22c924dd0314a13 --- A Gruntfile.js M composer.json A package.json 3 files changed, 39 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceUEModulePDF refs/changes/70/401170/1 diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ea67e84 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json index f799580..2772d0d 100644 --- a/composer.json +++ b/composer.json @@ -5,5 +5,14 @@ "license": "GPL-3.0", "require": { "composer/installers": "~1.0" + }, + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.2", + "jakub-onderka/php-console-highlighter": "0.3.2" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor --exclude node_modules" + ] } } diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/401170 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic17077d94b4a8b8e6e073527e22c924dd0314a13 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceUEModulePDF Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceSaferEdit[master]: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401169 ) Change subject: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker .. Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files php-lint will test for valid php files Change-Id: Ia4910827b5e7c5cb16e7fa0925a438b25b7c023e --- A Gruntfile.js M composer.json A package.json 3 files changed, 38 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceSaferEdit refs/changes/69/401169/1 diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ea67e84 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json index b9ea082..7a568dc 100644 --- a/composer.json +++ b/composer.json @@ -6,14 +6,14 @@ "require": { "composer/installers": "~1.0" }, -"require-dev": { -"jakub-onderka/php-parallel-lint": "0.9.2", -"jakub-onderka/php-console-highlighter": "0.3.2" -}, -"scripts": { -"test": [ -"parallel-lint . --exclude vendor --exclude node_modules" -] + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.2", + "jakub-onderka/php-console-highlighter": "0.3.2" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor --exclude node_modules" + ] }, "autoload" : { "files": [ "SaferEdit.class.php" ], diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/401169 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia4910827b5e7c5cb16e7fa0925a438b25b7c023e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceSaferEdit Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceInsertMagic[master]: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401166 ) Change subject: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker .. Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files php-lint will test for valid php files Change-Id: Ib3a57a12d49a62031ef3e3255d2663c8c0d73e33 --- A Gruntfile.js M composer.json A package.json 3 files changed, 39 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceInsertMagic refs/changes/66/401166/1 diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ea67e84 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json index 018bf12..caab47a 100644 --- a/composer.json +++ b/composer.json @@ -6,6 +6,15 @@ "require": { "composer/installers": "~1.0" }, + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.2", + "jakub-onderka/php-console-highlighter": "0.3.2" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor --exclude node_modules" + ] + }, "autoload": { "psr-4": { } diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/401166 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib3a57a12d49a62031ef3e3255d2663c8c0d73e33 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceInsertMagic Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceNamespaceCSS[master]: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401167 ) Change subject: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker .. Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files php-lint will test for valid php files Change-Id: Ic7ef5cda0d3480a77b669af8df65d29ee4a53327 --- A Gruntfile.js M composer.json A package.json 3 files changed, 39 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceNamespaceCSS refs/changes/67/401167/1 diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ea67e84 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json index 77c5577..b6eb128 100644 --- a/composer.json +++ b/composer.json @@ -6,6 +6,15 @@ "require": { "composer/installers": "~1.0" }, + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.2", + "jakub-onderka/php-console-highlighter": "0.3.2" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor --exclude node_modules" + ] + }, "autoload": { "psr-4": { } diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/401167 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic7ef5cda0d3480a77b669af8df65d29ee4a53327 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceNamespaceCSS Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpicePageAccess[master]: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401168 ) Change subject: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker .. Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files php-lint will test for valid php files Change-Id: Ifd76fada63adbde6c84fed1c24faded11884636f --- A Gruntfile.js M composer.json A package.json 3 files changed, 39 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpicePageAccess refs/changes/68/401168/1 diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ea67e84 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json index 680df45..b60d3fa 100644 --- a/composer.json +++ b/composer.json @@ -6,6 +6,15 @@ "require": { "composer/installers": "~1.0" }, + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.2", + "jakub-onderka/php-console-highlighter": "0.3.2" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor --exclude node_modules" + ] + }, "autoload" : { "psr-4": { "BlueSpice\\PageAccess\\" : "src", diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/401168 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifd76fada63adbde6c84fed1c24faded11884636f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpicePageAccess Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceInsertLink[master]: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401165 ) Change subject: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker .. Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files php-lint will test for valid php files Change-Id: I63cfd2a8778e0fb7b98608279716a85c1ddaef45 --- M .gitignore A Gruntfile.js M composer.json A package.json 4 files changed, 42 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceInsertLink refs/changes/65/401165/1 diff --git a/.gitignore b/.gitignore index 463cbe5..553a300 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,9 @@ *.kate-swp *.swp node_modules/** -vendor/composer/** +vendor/** +!vendor/src/** +!vendor/bsFileLinkChooser.jar composer.lock composer.phar diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ea67e84 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json index 27e4ea2..d31c959 100644 --- a/composer.json +++ b/composer.json @@ -6,6 +6,15 @@ "require": { "composer/installers": "~1.0" }, + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.2", + "jakub-onderka/php-console-highlighter": "0.3.2" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor --exclude node_modules" + ] + }, "autoload": { "psr-4": { } diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/401165 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I63cfd2a8778e0fb7b98608279716a85c1ddaef45 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceInsertLink Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceInsertCategory[master]: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401163 ) Change subject: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker .. Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files php-lint will test for valid php files Change-Id: I9c772f737e0e75bca953bf0cbbda00c347ef08d0 --- A Gruntfile.js M composer.json A package.json 3 files changed, 39 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceInsertCategory refs/changes/63/401163/1 diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ea67e84 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json index e6bc2ff..c05e502 100644 --- a/composer.json +++ b/composer.json @@ -6,6 +6,15 @@ "require": { "composer/installers": "~1.0" }, + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.2", + "jakub-onderka/php-console-highlighter": "0.3.2" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor --exclude node_modules" + ] + }, "autoload": { "psr-4": { } diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/401163 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9c772f737e0e75bca953bf0cbbda00c347ef08d0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceInsertCategory Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceInsertFile[master]: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401164 ) Change subject: Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker .. Add php-parallel-lint, grunt-jsonlint and grunt-banana-checker jsonlint and banana-checker will test for valid i18n files php-lint will test for valid php files Change-Id: I1124a9ca33c68388689090dc9580f63e015833ab --- A Gruntfile.js M composer.json A package.json 3 files changed, 39 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceInsertFile refs/changes/64/401164/1 diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..ea67e84 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); + grunt.loadNpmTasks( 'grunt-banana-checker' ); + + var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { + banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json index fce3012..fe0ab43 100644 --- a/composer.json +++ b/composer.json @@ -6,6 +6,15 @@ "require": { "composer/installers": "~1.0" }, + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.2", + "jakub-onderka/php-console-highlighter": "0.3.2" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor --exclude node_modules" + ] + }, "autoload": { "psr-4": { } diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/401164 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1124a9ca33c68388689090dc9580f63e015833ab Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceInsertFile Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Form[master]: Add php-parallel-lint and grunt-jsonlint
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401162 ) Change subject: Add php-parallel-lint and grunt-jsonlint .. Add php-parallel-lint and grunt-jsonlint jsonlint will test for valid i18n files php-lint will test for valid php files Change-Id: I27b0d36c1ba2ba05708401bbff5694f0ec0d6f2a --- A .gitignore A Gruntfile.js A composer.json A package.json 4 files changed, 44 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Form refs/changes/62/401162/1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..db8a779 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/node_modules +/vendor +/composer.lock diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 000..47d544d --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,19 @@ +module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-jsonlint' ); +// grunt.loadNpmTasks( 'grunt-banana-checker' ); + +// var conf = grunt.file.readJSON( 'extension.json' ); + grunt.initConfig( { +// banana: conf.MessagesDirs, + jsonlint: { + all: [ + '**/*.json', + '!node_modules/**', + '!vendor/**' + ] + } + } ); + + grunt.registerTask( 'test', [ 'jsonlint'/*, 'banana'*/ ] ); + grunt.registerTask( 'default', 'test' ); +}; diff --git a/composer.json b/composer.json new file mode 100644 index 000..aebd773 --- /dev/null +++ b/composer.json @@ -0,0 +1,11 @@ +{ + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.2", + "jakub-onderka/php-console-highlighter": "0.3.2" + }, + "scripts": { + "test": [ + "parallel-lint . --exclude vendor --exclude node_modules" + ] + } +} diff --git a/package.json b/package.json new file mode 100644 index 000..10fa9bc --- /dev/null +++ b/package.json @@ -0,0 +1,11 @@ +{ + "private": true, + "scripts": { + "test": "grunt test" + }, + "devDependencies": { + "grunt": "1.0.1", + "grunt-banana-checker": "0.6.0", + "grunt-jsonlint": "1.1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/401162 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I27b0d36c1ba2ba05708401bbff5694f0ec0d6f2a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Form Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Add some BlueSpice* extensions
Umherirrender has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401161 ) Change subject: Add some BlueSpice* extensions .. Add some BlueSpice* extensions - BlueSpiceHideTitle - BlueSpiceInsertCategory - BlueSpiceInsertFile - BlueSpiceInsertLink - BlueSpiceInsertMagic - BlueSpiceNamespaceCSS - BlueSpicePageAccess - BlueSpiceRSSFeeder - BlueSpiceSaferEdit - BlueSpiceUEModulePDF - BlueSpiceUniversalExport - BlueSpiceUsageTracker Change-Id: Id6094ce5e89e28a51bf25a920e2eb11c722fdea3 --- M .gitmodules A BlueSpiceHideTitle A BlueSpiceInsertCategory A BlueSpiceInsertFile A BlueSpiceInsertLink A BlueSpiceInsertMagic A BlueSpiceNamespaceCSS A BlueSpicePageAccess A BlueSpiceRSSFeeder A BlueSpiceSaferEdit A BlueSpiceUEModulePDF A BlueSpiceUniversalExport A BlueSpiceUsageTracker 13 files changed, 60 insertions(+), 0 deletions(-) Approvals: Umherirrender: Verified; Looks good to me, approved diff --git a/.gitmodules b/.gitmodules index a564b10..0c3c3e3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -254,6 +254,26 @@ path = BlueSpiceGroupManager url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceGroupManager branch = . +[submodule "BlueSpiceHideTitle"] + path = BlueSpiceHideTitle + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceHideTitle + branch = . +[submodule "BlueSpiceInsertCategory"] + path = BlueSpiceInsertCategory + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceInsertCategory + branch = . +[submodule "BlueSpiceInsertFile"] + path = BlueSpiceInsertFile + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceInsertFile + branch = . +[submodule "BlueSpiceInsertLink"] + path = BlueSpiceInsertLink + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceInsertLink + branch = . +[submodule "BlueSpiceInsertMagic"] + path = BlueSpiceInsertMagic + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceInsertMagic + branch = . [submodule "BlueSpiceInsertTemplate"] path = BlueSpiceInsertTemplate url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceInsertTemplate @@ -266,9 +286,17 @@ path = BlueSpiceMultiUpload url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceMultiUpload branch = . +[submodule "BlueSpiceNamespaceCSS"] + path = BlueSpiceNamespaceCSS + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceNamespaceCSS + branch = . [submodule "BlueSpiceNamespaceManager"] path = BlueSpiceNamespaceManager url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceNamespaceManager + branch = . +[submodule "BlueSpicePageAccess"] + path = BlueSpicePageAccess + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpicePageAccess branch = . [submodule "BlueSpicePageAssignments"] path = BlueSpicePageAssignments @@ -290,9 +318,25 @@ path = BlueSpicePermissionManager url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpicePermissionManager branch = . +[submodule "BlueSpiceRSSFeeder"] + path = BlueSpiceRSSFeeder + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceRSSFeeder + branch = . [submodule "BlueSpiceReaders"] path = BlueSpiceReaders url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceReaders + branch = . +[submodule "BlueSpiceUEModulePDF"] + path = BlueSpiceUEModulePDF + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceUEModulePDF + branch = . +[submodule "BlueSpiceUniversalExport"] + path = BlueSpiceUniversalExport + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceUniversalExport + branch = . +[submodule "BlueSpiceUsageTracker"] + path = BlueSpiceUsageTracker + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceUsageTracker branch = . [submodule "BlueSpiceUserManager"] path = BlueSpiceUserManager @@ -306,6 +350,10 @@ path = BlueSpiceSMWConnector url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceSMWConnector branch = . +[submodule "BlueSpiceSaferEdit"] + path = BlueSpiceSaferEdit + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceSaferEdit + branch = . [submodule "BlueSpiceSignHere"] path = BlueSpiceSignHere url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceSignHere diff --git a/BlueSpiceHideTitle b/BlueSpiceHideTitle new file mode 16 index 000..38dab09 --- /dev/null +++ b/BlueSpiceHideTitle @@ -0,0 +1 @@ +Subproject commit 38dab09ec9ec262ca0362d0235640a21836eb16c diff --git a/BlueSpiceInsertCate
[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Add some BlueSpice* extensions
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401161 ) Change subject: Add some BlueSpice* extensions .. Add some BlueSpice* extensions - BlueSpiceHideTitle - BlueSpiceInsertCategory - BlueSpiceInsertFile - BlueSpiceInsertLink - BlueSpiceInsertMagic - BlueSpiceNamespaceCSS - BlueSpicePageAccess - BlueSpiceRSSFeeder - BlueSpiceSaferEdit - BlueSpiceUEModulePDF - BlueSpiceUniversalExport - BlueSpiceUsageTracker Change-Id: Id6094ce5e89e28a51bf25a920e2eb11c722fdea3 --- M .gitmodules A BlueSpiceHideTitle A BlueSpiceInsertCategory A BlueSpiceInsertFile A BlueSpiceInsertLink A BlueSpiceInsertMagic A BlueSpiceNamespaceCSS A BlueSpicePageAccess A BlueSpiceRSSFeeder A BlueSpiceSaferEdit A BlueSpiceUEModulePDF A BlueSpiceUniversalExport A BlueSpiceUsageTracker 13 files changed, 60 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/61/401161/1 diff --git a/.gitmodules b/.gitmodules index a564b10..0c3c3e3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -254,6 +254,26 @@ path = BlueSpiceGroupManager url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceGroupManager branch = . +[submodule "BlueSpiceHideTitle"] + path = BlueSpiceHideTitle + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceHideTitle + branch = . +[submodule "BlueSpiceInsertCategory"] + path = BlueSpiceInsertCategory + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceInsertCategory + branch = . +[submodule "BlueSpiceInsertFile"] + path = BlueSpiceInsertFile + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceInsertFile + branch = . +[submodule "BlueSpiceInsertLink"] + path = BlueSpiceInsertLink + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceInsertLink + branch = . +[submodule "BlueSpiceInsertMagic"] + path = BlueSpiceInsertMagic + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceInsertMagic + branch = . [submodule "BlueSpiceInsertTemplate"] path = BlueSpiceInsertTemplate url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceInsertTemplate @@ -266,9 +286,17 @@ path = BlueSpiceMultiUpload url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceMultiUpload branch = . +[submodule "BlueSpiceNamespaceCSS"] + path = BlueSpiceNamespaceCSS + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceNamespaceCSS + branch = . [submodule "BlueSpiceNamespaceManager"] path = BlueSpiceNamespaceManager url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceNamespaceManager + branch = . +[submodule "BlueSpicePageAccess"] + path = BlueSpicePageAccess + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpicePageAccess branch = . [submodule "BlueSpicePageAssignments"] path = BlueSpicePageAssignments @@ -290,9 +318,25 @@ path = BlueSpicePermissionManager url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpicePermissionManager branch = . +[submodule "BlueSpiceRSSFeeder"] + path = BlueSpiceRSSFeeder + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceRSSFeeder + branch = . [submodule "BlueSpiceReaders"] path = BlueSpiceReaders url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceReaders + branch = . +[submodule "BlueSpiceUEModulePDF"] + path = BlueSpiceUEModulePDF + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceUEModulePDF + branch = . +[submodule "BlueSpiceUniversalExport"] + path = BlueSpiceUniversalExport + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceUniversalExport + branch = . +[submodule "BlueSpiceUsageTracker"] + path = BlueSpiceUsageTracker + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceUsageTracker branch = . [submodule "BlueSpiceUserManager"] path = BlueSpiceUserManager @@ -306,6 +350,10 @@ path = BlueSpiceSMWConnector url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceSMWConnector branch = . +[submodule "BlueSpiceSaferEdit"] + path = BlueSpiceSaferEdit + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceSaferEdit + branch = . [submodule "BlueSpiceSignHere"] path = BlueSpiceSignHere url = https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceSignHere diff --git a/BlueSpiceHideTitle b/BlueSpiceHideTitle new file mode 16 index 000..38dab09 --- /dev/null +++ b/BlueSpiceHideTitle @@ -0,0 +1 @@ +Subproject commit 38dab09ec9ec262ca0362d0235640a21836eb16c diff --git a/Bl
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add patrol to Image-reviewer on Commons
Revi has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/401160 ) Change subject: Add patrol to Image-reviewer on Commons .. Add patrol to Image-reviewer on Commons * Add patrol * Make one-line to multiple lines, for readability Change-Id: Ib2a315b47d63a3f21f47e6fea34f29ecdb053114 Signed-off-by: Yongmin Hong --- M wmf-config/InitialiseSettings.php 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/60/401160/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 7c00204..938cf7f 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -8262,7 +8262,11 @@ 'patroller' => [ 'autopatrol' => true, 'patrol' => true, 'abusefilter-log-detail' => true ], 'autopatrolled' => [ 'autopatrol' => true ], 'filemover' => [ 'movefile' => true ], - 'Image-reviewer' => [ 'autopatrol' => true, 'upload_by_url' => true ], + 'Image-reviewer' => [ + 'autopatrol' => true, + 'upload_by_url' => true, + 'patrol' => true, // T183835 +], 'extended-uploader' => [ 'autoconfirmed' => true, 'upload' => true, -- To view, visit https://gerrit.wikimedia.org/r/401160 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib2a315b47d63a3f21f47e6fea34f29ecdb053114 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Revi ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Add an add_only parameter to replaceCategoryInPlace in textlib
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/400264 ) Change subject: Add an add_only parameter to replaceCategoryInPlace in textlib .. Add an add_only parameter to replaceCategoryInPlace in textlib Bug: T183707 Change-Id: I67238337ee82e51ab6c876bbdfe32b05e7836cd2 --- M pywikibot/textlib.py M tests/textlib_tests.py 2 files changed, 20 insertions(+), 1 deletion(-) Approvals: Framawiki: Looks good to me, but someone else must approve jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index cedb30d..71abed2 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -1164,13 +1164,16 @@ return removeCategoryLinks(text, site, marker) -def replaceCategoryInPlace(oldtext, oldcat, newcat, site=None): +def replaceCategoryInPlace(oldtext, oldcat, newcat, site=None, + add_only=False): """ Replace old category with new one and return the modified text. @param oldtext: Content of the old category @param oldcat: pywikibot.Category object of the old category @param newcat: pywikibot.Category object of the new category +@param add_only: If add_only is True, the old category won't +be replaced and the category given will be added after it. @return: the modified text @rtype: unicode """ @@ -1203,6 +1206,13 @@ text = replaceExcept(text, categoryR, '', ['nowiki', 'comment', 'math', 'pre', 'source'], site=site) +elif add_only: +text = replaceExcept(oldtext, categoryR, + '{0}\n{1}'.format( + oldcat.title(asLink=True), + newcat.title(asLink=True)), + ['nowiki', 'comment', 'math', 'pre', 'source'], + site=site) else: text = replaceExcept(oldtext, categoryR, '[[%s:%s\\2' % (site.namespace(14), diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index fb77566..476a7ba 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -244,6 +244,15 @@ # First and third categories are the same self.assertEqual([cats[1], cats[3]], temp_cats) +# Testing adding categories +temp = textlib.replaceCategoryInPlace( +self.old, cats[0], cats[1], site=self.site, +add_only=True) +self.assertNotEqual(temp, self.old) +temp_cats = textlib.getCategoryLinks(temp, site=self.site) +self.assertEqual([cats[0], cats[1], cats[1], + cats[2], cats[1], cats[3]], temp_cats) + new_cats = textlib.getCategoryLinks(new, site=self.site) self.assertEqual(cats, new_cats) -- To view, visit https://gerrit.wikimedia.org/r/400264 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I67238337ee82e51ab6c876bbdfe32b05e7836cd2 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Eflyjason Gerrit-Reviewer: Framawiki Gerrit-Reviewer: John Vandenberg Gerrit-Reviewer: Xqt Gerrit-Reviewer: Zoranzoki21 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: download_dump: Add -revision parameter
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401091 ) Change subject: download_dump: Add -revision parameter .. download_dump: Add -revision parameter Add `-revision` parameter in `scripts/maintenance/download_dump.py` which used for specifying the revision of the file dump that wanna be downloaded. Bug: T183789 Change-Id: I3e7e22f3f5f35e71e3793f8f5b568c7e97aa4b1c --- M scripts/maintenance/download_dump.py 1 file changed, 29 insertions(+), 4 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/scripts/maintenance/download_dump.py b/scripts/maintenance/download_dump.py index c55940b..853d33f 100644 --- a/scripts/maintenance/download_dump.py +++ b/scripts/maintenance/download_dump.py @@ -9,6 +9,9 @@ -storepath:#The stored file's path. +-revision:# The revision date of the dump (default to `latest`) +formatted as MMDD. + """ # # (C) Pywikibot team, 2017 @@ -55,6 +58,7 @@ 'wikiname': '', 'filename': '', 'storepath': './', +'revision': 'latest', } def __init__(self, **kwargs): @@ -78,8 +82,11 @@ """Run bot.""" pywikibot.output('Downloading dump from ' + self.getOption('wikiname')) -download_filename = self.getOption('wikiname') + \ -'-latest-' + self.getOption('filename') +download_filename = '{wiki_name}-{revision}-{filename}'.format( +wiki_name=self.getOption('wikiname'), +revision=self.getOption('revision'), +filename=self.getOption('filename') +) temp_filename = download_filename + '-' + \ binascii.b2a_hex(urandom(8)).decode('ascii') + '.part' @@ -104,14 +111,27 @@ remove(file_final_storepath) symlink(toolforge_dump_filepath, file_current_storepath) else: -url = 'https://dumps.wikimedia.org/{0}/latest/{1}'.format( -self.getOption('wikiname'), download_filename) +url = 'https://dumps.wikimedia.org/{0}/{1}/{2}'.format( +self.getOption('wikiname'), +self.getOption('revision'), +download_filename) pywikibot.output('Downloading file from ' + url) response = fetch(url, stream=True) if response.status == 200: with open(file_current_storepath, 'wb') as result_file: for data in response.data.iter_content(100 * 1024): result_file.write(data) +elif response.status == 404: +pywikibot.output( +'File with name "{filename}", ' +'from revision "{revision}", ' +'and wiki "{wikiname}" ({url}) isn\'t ' +'available in the Wikimedia Dumps'.format( +filename=self.getOption('filename'), +revision=self.getOption('revision'), +url=url, +wikiname=self.getOption('wikiname'))) +return else: return # Rename the temporary file to the target file @@ -165,6 +185,11 @@ opts[option] = os.path.abspath(value) or pywikibot.input( 'Enter the store path: ') continue +elif option == 'revision': +opts[option] = value or pywikibot.input( +'Enter the revision of the dump: ') +continue + unknown_args += [arg] missing = [] -- To view, visit https://gerrit.wikimedia.org/r/401091 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3e7e22f3f5f35e71e3793f8f5b568c7e97aa4b1c Gerrit-PatchSet: 5 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Rafidaslam Gerrit-Reviewer: Framawiki Gerrit-Reviewer: John Vandenberg Gerrit-Reviewer: Xqt Gerrit-Reviewer: Zhuyifei1999 Gerrit-Reviewer: Zoranzoki21 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: comms.http: Include HttpRequest.kwargs in session.request call
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/401116 ) Change subject: comms.http: Include HttpRequest.kwargs in session.request call .. comms.http: Include HttpRequest.kwargs in session.request call Include threadedhttp.HttpRequest.kwargs in session.request call in `_http_process()`. Before this HttpRequest.kwargs didn't get into session.request call so if we call a function like `pywikibot.comms.http.fetch()` with parameter like `stream=True`, the `stream` param would be ignored. Bug: T183830 Change-Id: I02d71a933bc1ef0073a0ec34534b4fc10e91 --- M pywikibot/comms/http.py 1 file changed, 12 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index b6fb20d..ba569f6 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -349,6 +349,16 @@ def _http_process(session, http_request): +""" +Process an `threadedhttp.HttpRequest` instance. + +@param session: Session that will be used to process the `http_request`. +@type session: L{requests.Session} +@param http_request: Request that will be processed. +@type http_request: L{threadedhttp.HttpRequest} +@return: None +@rtype: None +""" method = http_request.method uri = http_request.uri params = http_request.params @@ -374,7 +384,8 @@ # verify=True, when a request with verify=False happened before response = session.request(method, uri, params=params, data=body, headers=headers, auth=auth, timeout=timeout, - verify=not ignore_validation) + verify=not ignore_validation, + **http_request.kwargs) except Exception as e: http_request.data = e else: -- To view, visit https://gerrit.wikimedia.org/r/401116 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I02d71a933bc1ef0073a0ec34534b4fc10e91 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Rafidaslam Gerrit-Reviewer: John Vandenberg Gerrit-Reviewer: Rafidaslam Gerrit-Reviewer: Xqt Gerrit-Reviewer: Zoranzoki21 Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits