[MediaWiki-commits] [Gerrit] Add comments clarifying how calling getters on ParserOutput ... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Add comments clarifying how calling getters on ParserOutput
affects the parser cache.
..
Add comments clarifying how calling getters on ParserOutput affects the parser
cache.
Change-Id: Ie6a4a8989df218f88cfc7c1cf1d4b68cf871abbb
---
M includes/parser/ParserOptions.php
M includes/parser/ParserOutput.php
2 files changed, 20 insertions(+), 9 deletions(-)
Approvals:
Aude: Looks good to me, approved
Addshore: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/parser/ParserOptions.php
b/includes/parser/ParserOptions.php
index e4c867a..4459047 100644
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -372,18 +372,17 @@
}
/**
-* Get the user language used by the parser for this page and record the
-* userlang parser option, which splits parser cache.
+* Get the user language used by the parser for this page and split the
parser cache.
*
-* You shouldn't use this. Really. $parser-getFunctionLang() is all
you need.
+* @warning: Calling this causes the parser cache to be fragmented by
user language!
+* To avoid cache fragmentation, output should not depend on the user
language.
+* Use Parser::getFunctionLang() or Parser::getTargetLanguage() instead!
*
-* To avoid side-effects where the page will be rendered based on the
language
-* of the user who last saved, this function will trigger a cache
fragmentation.
-* For that reason, usage of this method is discouraged unless it is
desired to
-* split caches based on user language, such as for multilingual
content.
+* @note This function will trigger a cache fragmentation by recording
the
+* 'userlang' option, see optionUsed(). This is done to avoid cache
pollution
+* when the page is rendered based on the language of the user.
*
-* When saving, this will return the default language instead of the
user's.
-*
+* @note When saving, this will return the default language instead of
the user's.
* {{int: }} uses this which used to produce inconsistent link tables
(bug 14404).
*
* @return Language
@@ -396,6 +395,12 @@
/**
* Same as getUserLangObj() but returns a string instead.
+*
+* @warning: Calling this causes the parser cache to be fragmented by
user language!
+* To avoid cache fragmentation, output should not depend on the user
language.
+* Use Parser::getFunctionLang() or Parser::getTargetLanguage() instead!
+*
+* @see getUserLangObj()
*
* @return string Language code
* @since 1.17
@@ -702,6 +707,10 @@
/**
* Called when an option is accessed.
+* Calls the watcher that was set using registerWatcher().
+* Typically, the watcher callback is ParserOutput::registerOption().
+* The information registered that way will be used by
ParserCache::save().
+*
* @param string $optionName Name of the option
*/
public function optionUsed( $optionName ) {
diff --git a/includes/parser/ParserOutput.php b/includes/parser/ParserOutput.php
index 15321c2..2eb1dc9 100644
--- a/includes/parser/ParserOutput.php
+++ b/includes/parser/ParserOutput.php
@@ -686,6 +686,8 @@
/**
* Tags a parser option for use in the cache key for this parser output.
* Registered as a watcher at ParserOptions::registerWatcher() by
Parser::clearState().
+* The information gathered here is available via getUsedOptions(),
+* and is used by ParserCache::save().
*
* @see ParserCache::getKey
* @see ParserCache::save
--
To view, visit https://gerrit.wikimedia.org/r/233994
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6a4a8989df218f88cfc7c1cf1d4b68cf871abbb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Aude aude.w...@gmail.com
Gerrit-Reviewer: Cscott canan...@wikimedia.org
Gerrit-Reviewer: Daniel Kinzler daniel.kinz...@wikimedia.de
Gerrit-Reviewer: Jackmcbarn jackmcb...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Amend fix-stats.php to also find and add missing tags - change (mediawiki...ContentTranslation)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234508
Change subject: Amend fix-stats.php to also find and add missing tags
..
Amend fix-stats.php to also find and add missing tags
Bug: T110316
Change-Id: Ied6cfcfaf7ba74676e0052fdcc8edcad381e8051
---
M scripts/fix-stats.php
1 file changed, 89 insertions(+), 13 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/08/234508/1
diff --git a/scripts/fix-stats.php b/scripts/fix-stats.php
index d55e17c..c671919 100644
--- a/scripts/fix-stats.php
+++ b/scripts/fix-stats.php
@@ -27,6 +27,7 @@
);
$this-resets = array();
+ $this-tags = array();
}
public function execute() {
@@ -50,26 +51,65 @@
$row-translation_target_title,
$row-translation_target_language
);
+
$this-output( $name ({$row-translation_status})\n );
$this-checkTargetUrl( $row );
-
}
- $count = count( $this-resets );
+ $this-changeStatus( $this-resets, $this-dryrun );
+ $this-addTags( $this-tags, $this-dryrun );
+ }
+
+ protected function changeStatus( $resets, $dry ) {
+ $count = count( $resets );
if ( !$count ) {
- $this-output( No changes to do\n );
+ $this-output( No changes to do to the central
database\n );
+
return;
}
- if ( $this-dryrun ) {
+ if ( $dry ) {
$this-output( $count rows would be updated to set
target_url to null\n );
- } else {
- $this-output( $count rows ARE updated to set
target_url to null\n );
- $db-update(
- 'cx_translations',
- array( 'translation_target_url' = null ),
- array( 'translation_id' = $this-resets ),
- __METHOD__
+
+ return;
+ }
+
+ $this-output( $count rows ARE updated to set target_url to
null\n );
+ $db-update(
+ 'cx_translations',
+ array( 'translation_target_url' = null ),
+ array( 'translation_id' = $resets ),
+ __METHOD__
+ );
+ }
+
+ protected function addTags( $items, $dry ) {
+ $count = count( $items );
+ if ( !$count ) {
+ $this-output( No revisions to tag\n );
+
+ return;
+ }
+
+ if ( $dry ) {
+ $this-output( $count revisions would be tagged\n );
+
+ return;
+ }
+
+ $this-output( $count rows are tagged\n );
+
+ foreach ( $items as $item ) {
+ list( $row, $revId ) = $item;
+ ChangeTags::addTags(
+ 'contenttranslation',
+ null,
+ $revId,
+ null,
+ FormatJson::encode( array(
+ 'from' =
$row-translation_source_language,
+ 'to' =
$row-translation_target_language,
+ ) )
);
}
}
@@ -116,14 +156,27 @@
if ( $title-exists() ) {
if ( $this-hasCxTag( $title, $row ) ) {
if ( $row-translation_status === 'draft' ) {
- $this-output( \\- E20 Page currently
exists but status is draft\n );
+ $this-output( \\- E20 Page exists but
status is draft\n );
} else {
// status=published and page created
with CX, the ideal case
}
} elseif ( $title-isRedirect() ) {
$this-output( \\- E22 Page is a redirect\n );
} else {
- $this-output( \\- E24 Page currently exists
but not created with CX\n );
+ $user =
ContentTranslation\GlobalUser::newFromId( $row-translation_started_by );
+ $userName = $user-getName();
+ $revId = $this-findRevisionToTag(
+ $title,
+ $userName,
+
[MediaWiki-commits] [Gerrit] Add 'match' and 'case' parameters for search translations API. - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Add 'match' and 'case' parameters for search translations API.
..
Add 'match' and 'case' parameters for search translations API.
Change-Id: I84e9e9f5d6ce2c4eaed735a589ff7823345c7779
---
M api/ApiSearchTranslations.php
M i18n/api/en.json
M i18n/api/qqq.json
3 files changed, 12 insertions(+), 0 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/api/ApiSearchTranslations.php b/api/ApiSearchTranslations.php
index eb2ff13..e07785b 100644
--- a/api/ApiSearchTranslations.php
+++ b/api/ApiSearchTranslations.php
@@ -83,6 +83,14 @@
ApiBase::PARAM_TYPE = $filters,
ApiBase::PARAM_DFLT = '',
),
+ 'match' = array(
+ ApiBase::PARAM_TYPE = 'string',
+ ApiBase::PARAM_DFLT = '',
+ ),
+ 'case' = array(
+ ApiBase::PARAM_TYPE = 'string',
+ ApiBase::PARAM_DFLT = '0',
+ ),
'offset' = array(
ApiBase::PARAM_TYPE = 'integer',
ApiBase::PARAM_DFLT = 0,
diff --git a/i18n/api/en.json b/i18n/api/en.json
index b0f259f..b78a793 100644
--- a/i18n/api/en.json
+++ b/i18n/api/en.json
@@ -82,6 +82,8 @@
apihelp-searchtranslations-param-language: The language code to
search string for.,
apihelp-searchtranslations-param-group: The group id to search
string in.,
apihelp-searchtranslations-param-filter: Message translation status
filter.,
+ apihelp-searchtranslations-param-match: Match any/all search words.,
+ apihelp-searchtranslations-param-case: Case (in)sensitive search.,
apihelp-searchtranslations-param-offset: Offset for the
translations.,
apihelp-searchtranslations-param-limit: Size of the result.,
apihelp-searchtranslations-example-1: Show translations for the
language.,
diff --git a/i18n/api/qqq.json b/i18n/api/qqq.json
index 4217fa6..c20b52b 100644
--- a/i18n/api/qqq.json
+++ b/i18n/api/qqq.json
@@ -87,6 +87,8 @@
apihelp-searchtranslations-param-language:
{{doc-apihelp-param|searchtranslations|language}},
apihelp-searchtranslations-param-group:
{{doc-apihelp-param|searchtranslations|group}},
apihelp-searchtranslations-param-filter:
{{doc-apihelp-param|searchtranslations|filter}},
+ apihelp-searchtranslations-param-match:
{{doc-apihelp-param|searchtranslations|match}},
+ apihelp-searchtranslations-param-case:
{{doc-apihelp-param|searchtranslations|case}},
apihelp-searchtranslations-param-offset:
{{doc-apihelp-param|searchtranslations|offset}},
apihelp-searchtranslations-param-limit:
{{doc-apihelp-param|searchtranslations|limit}},
apihelp-searchtranslations-example-1:
{{doc-apihelp-example|searchtranslations}},
--
To view, visit https://gerrit.wikimedia.org/r/233436
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I84e9e9f5d6ce2c4eaed735a589ff7823345c7779
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Phoenix303 divyalife...@gmail.com
Gerrit-Reviewer: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] UEModulePDF: Added PHP 5.6 compatibility - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review. https://gerrit.wikimedia.org/r/234523 Change subject: UEModulePDF: Added PHP 5.6 compatibility .. UEModulePDF: Added PHP 5.6 compatibility Due to new security settings in PHP 5.6 the '@' annotation for uploads with cURL is not allowed anymore. We need to use CURLFile class instead. See http://php.net/manual/de/class.curlfile.php Change-Id: Id59085b9abfa19047bba42db079a1967a962dfb7 --- M UEModulePDF/includes/PDFServlet.class.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/23/234523/1 diff --git a/UEModulePDF/includes/PDFServlet.class.php b/UEModulePDF/includes/PDFServlet.class.php index 89ee038..6af43ab 100644 --- a/UEModulePDF/includes/PDFServlet.class.php +++ b/UEModulePDF/includes/PDFServlet.class.php @@ -46,7 +46,7 @@ 'fileType' = '', //Need to stay empty so UploadAsset servlet saves file to document root directory 'documentToken' = $this-aParams['document-token'], 'sourceHtmlFile_name' = basename( $sTmpHtmlFile ), - 'sourceHtmlFile' = '@'.$sTmpHtmlFile, + 'sourceHtmlFile' = class_exists( 'CURLFile' ) ? new CURLFile( $sFilePath ) : '@'.$sFilePath, 'wikiId' = wfWikiID() ) ); @@ -125,7 +125,7 @@ continue; } $aPostData['file'.$iCounter.'_name'] = $sFileName; - $aPostData['file'.$iCounter] = '@'.$sFilePath; + $aPostData['file'.$iCounter] = class_exists( 'CURLFile' ) ? new CURLFile( $sFilePath ) : '@'.$sFilePath; $iCounter++; } -- To view, visit https://gerrit.wikimedia.org/r/234523 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id59085b9abfa19047bba42db079a1967a962dfb7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: REL1_23 Gerrit-Owner: Robert Vogel vo...@hallowelt.biz ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow SSH access from puppet master for puppet-merge - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: Allow SSH access from puppet master for puppet-merge
..
Allow SSH access from puppet master for puppet-merge
Change-Id: I2da89c774718c0e9c6d01aaa1febe1426490b9ff
---
M manifests/role/puppetmaster.pp
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/puppetmaster.pp b/manifests/role/puppetmaster.pp
index 83caf4a..482d5a9 100644
--- a/manifests/role/puppetmaster.pp
+++ b/manifests/role/puppetmaster.pp
@@ -61,6 +61,12 @@
proto = 'tcp',
port = 8141,
}
+
+ferm::service { 'ssh_puppet_merge':
+proto = 'tcp',
+port = '22',
+srange = $::serverip,
+}
}
class role::puppetmaster::labs {
--
To view, visit https://gerrit.wikimedia.org/r/234514
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2da89c774718c0e9c6d01aaa1febe1426490b9ff
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff mmuhlenh...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update repository to mediawiki_selenium Ruby gem 1.x - change (mediawiki...WikiLove)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/234527 Change subject: Update repository to mediawiki_selenium Ruby gem 1.x .. Update repository to mediawiki_selenium Ruby gem 1.x Bug: T99660 Change-Id: I83a5035dae72b42acf89d74b77c6f920d093fbc8 --- M Gemfile M Gemfile.lock A tests/browser/environments.yml M tests/browser/features/support/env.rb M tests/browser/features/support/pages/wikilove_page.rb 5 files changed, 82 insertions(+), 52 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiLove refs/changes/27/234527/1 diff --git a/Gemfile b/Gemfile index 11e2184..6209ad7 100755 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,4 @@ -#ruby=ruby-2.1.1 -#ruby-gemset=WikiLove - source https://rubygems.org; -gem mediawiki_selenium +gem mediawiki_selenium, ~ 1.5.0 gem rubocop, require: false diff --git a/Gemfile.lock b/Gemfile.lock index 6fbad9f..ca03a28 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,56 +5,57 @@ astrolabe (1.3.0) parser (= 2.2.0.pre.3, 3.0) builder (3.2.2) -childprocess (0.5.3) +childprocess (0.5.6) ffi (~ 1.0, = 1.0.11) -cucumber (1.3.16) +cucumber (1.3.20) builder (= 2.1.2) diff-lcs (= 1.1.3) gherkin (~ 2.12) multi_json (= 1.7.5, 2.0) - multi_test (= 0.1.1) -data_magic (0.19) + multi_test (= 0.1.2) +data_magic (0.21) faker (= 1.1.2) - yml_reader (= 0.3) + yml_reader (= 0.4) diff-lcs (1.2.5) -domain_name (0.5.20) +domain_name (0.5.24) unf (= 0.0.5, 1.0.0) faker (1.4.3) i18n (~ 0.5) -faraday (0.9.0) +faraday (0.9.1) multipart-post (= 1.2, 3) faraday-cookie_jar (0.0.6) faraday (= 0.7.4) http-cookie (~ 1.0.0) -ffi (1.9.3) +ffi (1.9.10) gherkin (2.12.2) multi_json (~ 1.3) -headless (1.0.2) +headless (2.2.0) http-cookie (1.0.2) domain_name (~ 0.5) -i18n (0.6.11) -json (1.8.1) -mediawiki_api (0.2.1) +i18n (0.7.0) +json (1.8.3) +mediawiki_api (0.4.1) faraday (~ 0.9, = 0.9.0) faraday-cookie_jar (~ 0.0, = 0.0.6) -mediawiki_selenium (0.3.2) - cucumber (~ 1.3, = 1.3.10) - headless (~ 1.0, = 1.0.1) +mediawiki_selenium (1.5.0) + cucumber (~ 1.3, = 1.3.20) + headless (~ 2.0, = 2.1.0) json (~ 1.8, = 1.8.1) - mediawiki_api (~ 0.2, = 0.2.1) + mediawiki_api (~ 0.4, = 0.4.1) page-object (~ 1.0) rest-client (~ 1.6, = 1.6.7) rspec-expectations (~ 2.14, = 2.14.4) syntax (~ 1.2, = 1.2.0) -mime-types (2.3) -multi_json (1.10.1) -multi_test (0.1.1) + thor (~ 0.19, = 0.19.1) +mime-types (2.6.1) +multi_json (1.11.2) +multi_test (0.1.2) multipart-post (2.0.0) -netrc (0.7.7) -page-object (1.0.2) +netrc (0.10.3) +page-object (1.1.0) page_navigation (= 0.9) - selenium-webdriver (= 2.42.0) - watir-webdriver (= 0.6.9) + selenium-webdriver (= 2.44.0) + watir-webdriver (= 0.6.11) page_navigation (0.9) data_magic (= 0.14) parser (2.2.0.pre.4) @@ -62,7 +63,8 @@ slop (~ 3.4, = 3.4.5) powerpack (0.0.9) rainbow (2.0.0) -rest-client (1.7.2) +rest-client (1.8.0) + http-cookie (= 1.0.2, 2.0) mime-types (= 1.16, 3.0) netrc (~ 0.7) rspec-expectations (2.99.2) @@ -74,25 +76,26 @@ rainbow (= 1.99.1, 3.0) ruby-progressbar (~ 1.4) ruby-progressbar (1.6.0) -rubyzip (1.1.6) -selenium-webdriver (2.42.0) - childprocess (= 0.5.0) +rubyzip (1.1.7) +selenium-webdriver (2.47.1) + childprocess (~ 0.5) multi_json (~ 1.0) rubyzip (~ 1.0) - websocket (~ 1.0.4) + websocket (~ 1.0) slop (3.6.0) syntax (1.2.0) +thor (0.19.1) unf (0.1.4) unf_ext -unf_ext (0.0.6) -watir-webdriver (0.6.10) - selenium-webdriver (= 2.18.0) -websocket (1.0.7) -yml_reader (0.3) +unf_ext (0.0.7.1) +watir-webdriver (0.8.0) + selenium-webdriver (= 2.46.2) +websocket (1.2.2) +yml_reader (0.5) PLATFORMS ruby DEPENDENCIES - mediawiki_selenium + mediawiki_selenium (~ 1.5.0) rubocop diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml new file mode 100644 index 000..35eb153 --- /dev/null +++ b/tests/browser/environments.yml @@ -0,0 +1,39 @@ +# Customize this configuration as necessary to provide defaults for various +# test environments. +# +# The set of defaults to use is determined by the MEDIAWIKI_ENVIRONMENT +# environment variable. +# +# export MEDIAWIKI_ENVIRONMENT=mw-vagrant-host +# bundle exec cucumber +# +# Additional variables set by the environment will override the corresponding +# defaults defined here. +# +# export MEDIAWIKI_ENVIRONMENT=mw-vagrant-host +# export MEDIAWIKI_USER=Selenium_user2 +#
[MediaWiki-commits] [Gerrit] Tidy up infomation flow in SpecialListProperties - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Tidy up infomation flow in SpecialListProperties
..
Tidy up infomation flow in SpecialListProperties
Change-Id: Iec9c3ad35133e14ae04c3b168e6f7492c8d71ceb
---
M repo/includes/specials/SpecialListProperties.php
M repo/tests/phpunit/includes/specials/SpecialListPropertiesTest.php
2 files changed, 44 insertions(+), 67 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/specials/SpecialListProperties.php
b/repo/includes/specials/SpecialListProperties.php
index 34009eb..d6c5513 100644
--- a/repo/includes/specials/SpecialListProperties.php
+++ b/repo/includes/specials/SpecialListProperties.php
@@ -9,12 +9,14 @@
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Services\EntityId\EntityIdFormatter;
+use Wikibase\DataModel\Services\Lookup\LabelDescriptionLookup;
use Wikibase\DataTypeSelector;
+use Wikibase\LanguageFallbackChainFactory;
use Wikibase\Lib\Store\EntityTitleLookup;
use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookup;
use Wikibase\PropertyInfoStore;
-use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookupFactory;
use Wikibase\Repo\WikibaseRepo;
+use Wikibase\Store\BufferingTermLookup;
use Wikibase\View\EntityIdFormatterFactory;
/**
@@ -45,16 +47,6 @@
private $propertyInfoStore;
/**
-* @var EntityIdFormatterFactory
-*/
- private $entityIdFormatterFactory;
-
- /**
-* @var LanguageFallbackLabelDescriptionLookupFactory
-*/
- private $labelDescriptionLookupFactory;
-
- /**
* @var LanguageFallbackLabelDescriptionLookup
*/
private $labelDescriptionLookup;
@@ -63,11 +55,6 @@
* @var string
*/
private $dataType;
-
- /**
-* @var PropertyId[]
-*/
- private $propertyIds = array();
/**
* @var EntityIdFormatter
@@ -79,6 +66,11 @@
*/
private $titleLookup;
+ /**
+* @var BufferingTermLookup
+*/
+ private $bufferingTermLookup;
+
public function __construct() {
parent::__construct( 'ListProperties' );
@@ -88,8 +80,9 @@
$wikibaseRepo-getDataTypeFactory(),
$wikibaseRepo-getStore()-getPropertyInfoStore(),
$wikibaseRepo-getEntityIdHtmlLinkFormatterFactory(),
-
$wikibaseRepo-getLanguageFallbackLabelDescriptionLookupFactory(),
- $wikibaseRepo-getEntityTitleLookup()
+ $wikibaseRepo-getLanguageFallbackChainFactory(),
+ $wikibaseRepo-getEntityTitleLookup(),
+ $wikibaseRepo-getBufferingTermLookup()
);
}
@@ -101,14 +94,27 @@
DataTypeFactory $dataTypeFactory,
PropertyInfoStore $propertyInfoStore,
EntityIdFormatterFactory $entityIdFormatterFactory,
- LanguageFallbackLabelDescriptionLookupFactory
$labelDescriptionLookupFactory,
- EntityTitleLookup $titleLookup
+ LanguageFallbackChainFactory $languageFallbackChainFactory,
+ EntityTitleLookup $titleLookup,
+ BufferingTermLookup $bufferingTermLookup
) {
+ $this-labelDescriptionLookup = new
LanguageFallbackLabelDescriptionLookup(
+ $bufferingTermLookup,
+ $languageFallbackChainFactory-newFromLanguage(
+ $this-getLanguage(),
+ LanguageFallbackChainFactory::FALLBACK_SELF
+ |
LanguageFallbackChainFactory::FALLBACK_VARIANTS
+ | LanguageFallbackChainFactory::FALLBACK_OTHERS
+ )
+ );
+
$this-dataTypeFactory = $dataTypeFactory;
$this-propertyInfoStore = $propertyInfoStore;
- $this-entityIdFormatterFactory = $entityIdFormatterFactory;
- $this-labelDescriptionLookupFactory =
$labelDescriptionLookupFactory;
+ $this-entityIdFormatter =
$entityIdFormatterFactory-getEntityIdFormater(
+ $this-labelDescriptionLookup
+ );
$this-titleLookup = $titleLookup;
+ $this-bufferingTermLookup = $bufferingTermLookup;
}
/**
@@ -211,16 +217,14 @@
* @return string
*/
protected function formatRow( $propertyId ) {
- $labelDescriptionLookup = $this-getLabelDescriptionLookup();
-
$title = $this-titleLookup-getTitleForId( $propertyId );
if ( !$title-exists() ) {
- return
[MediaWiki-commits] [Gerrit] Assign swift roles via ENC - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged. Change subject: Assign swift roles via ENC .. Assign swift roles via ENC Bug: T91553 Change-Id: Ibb0139e8857d068f6a57e648824b9e2f12e69806 --- M nodes/labs/staging.yaml 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/nodes/labs/staging.yaml b/nodes/labs/staging.yaml index 1923fa1..e2965f7 100644 --- a/nodes/labs/staging.yaml +++ b/nodes/labs/staging.yaml @@ -22,5 +22,9 @@ - role::cache::parsoid .*-cache-.*: - role::beta::availability_collector +.*-ms-be\d\d: + - role::swift::storage +.*-ms-fe\d\d: + - role::swift::proxy .*: - role::puppet::self -- To view, visit https://gerrit.wikimedia.org/r/200625 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibb0139e8857d068f6a57e648824b9e2f12e69806 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Thcipriani tcipri...@wikimedia.org Gerrit-Reviewer: Chad ch...@wikimedia.org Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename server-side kafka processor to server-side-0 - change (operations/puppet)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234532
Change subject: Rename server-side kafka processor to server-side-0
..
Rename server-side kafka processor to server-side-0
Change-Id: I1e09ea3f5b28f7fc05dceb86eaf8b2dda6e74fa6
---
M manifests/role/eventlogging.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/32/234532/1
diff --git a/manifests/role/eventlogging.pp b/manifests/role/eventlogging.pp
index e273c23..213f0bc 100644
--- a/manifests/role/eventlogging.pp
+++ b/manifests/role/eventlogging.pp
@@ -299,7 +299,7 @@
'eventlogging-00'
)
-eventlogging::service::processor { 'server-side-events-kafka':
+eventlogging::service::processor { 'server-side-0':
format = '%{seqId}d EventLogging %j',
input =
${kafka_base_uri}?topic=eventlogging-server-sidezookeeper_connect=${kafka_zookeeper_url}${kafka_consumer_args},
sid= $kafka_consumer_group,
--
To view, visit https://gerrit.wikimedia.org/r/234532
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e09ea3f5b28f7fc05dceb86eaf8b2dda6e74fa6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] small improvements + settings fix - change (mediawiki...BlueSpiceExtensions)
jenkins-bot has submitted this change and it was merged.
Change subject: small improvements + settings fix
..
small improvements + settings fix
* categories can now be added in view mode even if the page is not created yet
* categoryselect window now stays open untill the request is finished
* failure messages will be displayed by now
* setting for adding parents re-implemented
(window loading moved to foundation, see https://gerrit.wikimedia.org/r/233675)
Change-Id: I5c0d001d786d14a148d62655755844724864c071
---
M InsertCategory/InsertCategory.class.php
M InsertCategory/resources/BS.InsertCategory/Dialog.js
M InsertCategory/resources/bluespice.insertCategory.js
3 files changed, 59 insertions(+), 29 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/InsertCategory/InsertCategory.class.php
b/InsertCategory/InsertCategory.class.php
index 8c9a1c5..8f8a0f4 100644
--- a/InsertCategory/InsertCategory.class.php
+++ b/InsertCategory/InsertCategory.class.php
@@ -104,7 +104,8 @@
*/
public static function onBeforePageDisplay( $out, $skin ) {
$out-addModuleStyles('ext.bluespice.insertcategory.styles');
- $out-addModules('ext.bluespice.insertcategory');
+ $out-addModules( 'ext.bluespice.insertcategory' );
+ $out-addJsConfigVars( 'BSInsertCategoryWithParents',
BsConfig::get( 'MW::InsertCategory::WithParents' ) );
return true;
}
@@ -141,25 +142,33 @@
: explode( ',', $sTags );
$oTitle = Title::newFromID( $iArticleId );
- if ( $oTitle-exists() ) {
- $sCat = BsNamespaceHelper::getNamespaceName(
NS_CATEGORY );
- $sText =
BsPageContentProvider::getInstance()-getContentFromTitle( $oTitle,
Revision::RAW );
+ if ( is_null( $oTitle ) || !$oTitle-exists() ) {
+ $oRequest = RequestContext::getMain()-getRequest();
+ $sPageName = $oRequest-getVal( page_name, );
+ $oTitle = Title::newFromText( $sPageName );
+ }
+ $sCat = BsNamespaceHelper::getNamespaceName( NS_CATEGORY );
+ $sText =
BsPageContentProvider::getInstance()-getContentFromTitle( $oTitle,
Revision::RAW );
- // Remove all before adding
- $sPattern = '#^\[\['.$sCat.':.*?\]\]#im';
- $sText = preg_replace( $sPattern, '', $sText );
+ // Remove all before adding
+ $sPattern = '#^\[\[' . $sCat . ':.*?\]\]#im';
+ $sText = preg_replace( $sPattern, '', $sText );
- if ( !empty( $aTags ) ) {
- foreach ( $aTags as $sTag ) {
- $sText .= \n[[.$sCat.:$sTag]];
- }
+ if ( !empty( $aTags ) ) {
+ foreach ( $aTags as $sTag ) {
+ $sText .= \n[[ . $sCat . :$sTag]];
}
-
- $oArticle = new Article( $oTitle );
- $oArticle-doEdit( $sText, '', EDIT_UPDATE | EDIT_MINOR
);
}
- return FormatJson::encode( array( 'success' = true ) );
+ $oWikiPage = new WikiPage( $oTitle );
+ $oUser = RequestContext::getMain()-getUser();
+ $oContent = new WikitextContent( $sText );
+ $oStatus = $oWikiPage-doEditContent( $oContent, , 0, false,
$oUser );
+ if ( !$oStatus-isGood() ) {
+ return FormatJson::encode( array ( 'success' = false,
'msg' = $oStatus-getMessage() ) );
+ }
+
+ return FormatJson::encode( array ( 'success' = true ) );
}
/**
diff --git a/InsertCategory/resources/BS.InsertCategory/Dialog.js
b/InsertCategory/resources/BS.InsertCategory/Dialog.js
index 7d2f86b..9475322 100644
--- a/InsertCategory/resources/BS.InsertCategory/Dialog.js
+++ b/InsertCategory/resources/BS.InsertCategory/Dialog.js
@@ -56,7 +56,19 @@
},
onItemClick: function( tree, record, item, index, e, eOpts ) {
this.isDirty = true;
- this.bsCategories.addValue( [record.data.text] );
+ if ( mw.config.get( 'BSInsertCategoryWithParents' ) ) {
+ this.addValuesFromRecord( record );
+ }
+ else {
+ this.bsCategories.addValue( [ record.data.text ] );
+ }
+ },
+ addValuesFromRecord: function ( record ) {
+ //parentNode is null if there is no parent, internalId src is
the root of the categories
+ if ( typeof ( record.parentNode ) !== null
record.parentNode.internalId !== src ) {
+
[MediaWiki-commits] [Gerrit] resourceloader: Don't add * query parameter to load.php urls - change (mediawiki/core)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234509
Change subject: resourceloader: Don't add * query parameter to load.php urls
..
resourceloader: Don't add * query parameter to load.php urls
Follows-up r3 (8dab43f703). The IEUrlExtension library only considers the
query string if the base path has no extension (or if the dot is urlencoded).
Neither of which is the case for load.php urls.
Ref T30840.
Change-Id: I4a4ef7ef5ad7d74ecb47a44342e6324fa9844173
---
M includes/resourceloader/ResourceLoader.php
M resources/src/mediawiki/mediawiki.js
2 files changed, 3 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/09/234509/1
diff --git a/includes/resourceloader/ResourceLoader.php
b/includes/resourceloader/ResourceLoader.php
index cecb6a2..fd2263b 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -1486,9 +1486,7 @@
$query = self::createLoaderQuery( $context, $extraQuery );
$script = $this-getLoadScript( $source );
- // Prevent the IE6 extension check from being triggered (bug
28840)
- // by appending a character that's invalid in Windows
extensions ('*')
- return wfExpandUrl( wfAppendQuery( $script, $query ) . '*',
PROTO_RELATIVE );
+ return wfExpandUrl( wfAppendQuery( $script, $query ),
PROTO_RELATIVE );
}
/**
@@ -1516,9 +1514,7 @@
$only, $printable, $handheld, $extraQuery
);
- // Prevent the IE6 extension check from being triggered (bug
28840)
- // by appending a character that's invalid in Windows
extensions ('*')
- return wfExpandUrl( wfAppendQuery( $wgLoadScript, $query ) .
'*', PROTO_RELATIVE );
+ return wfExpandUrl( wfAppendQuery( $wgLoadScript, $query ),
PROTO_RELATIVE );
}
/**
diff --git a/resources/src/mediawiki/mediawiki.js
b/resources/src/mediawiki/mediawiki.js
index 6548896..21c6f27 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -1428,10 +1428,7 @@
currReqBase
);
request = sortQuery( request );
- // Support: IE6
- // Append * to satisfy load.php's
WebRequest::checkUrlExtension test.
- // This script isn't actually used in IE6, but
MediaWiki enforces it in general.
- addScript( sourceLoadScript + '?' + $.param(
request ) + '*' );
+ addScript( sourceLoadScript + '?' + $.param(
request ) );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/234509
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a4ef7ef5ad7d74ecb47a44342e6324fa9844173
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Another CentralAuth double cookie workaround - change (operations/puppet)
JanZerebecki has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234510
Change subject: Another CentralAuth double cookie workaround
..
Another CentralAuth double cookie workaround
There was still another cookie that if duplicated prevents login.
Bug: T109038
Change-Id: I0046aef6d8b294d9d079d778f72ee19e3085c751
---
M templates/varnish/text-frontend.inc.vcl.erb
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/10/234510/1
diff --git a/templates/varnish/text-frontend.inc.vcl.erb
b/templates/varnish/text-frontend.inc.vcl.erb
index 45f9ad9..9739e52 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -209,4 +209,9 @@
// The exact format of the cookie-delete string is copied from
examples of normal CA cookie deletes (e.g. for logouts?) seen in traffic logs
header.append(resp.http.Set-Cookie, centralauth_User=deleted;
expires=Thu, 01-Jan-1970 00:00:01 GMT; Max-Age=0; path=/; domain=.wikidata.org;
secure; httponly);
}
+ // another variant with centralauth_Session (see
https://phabricator.wikimedia.org/T109038#1581615 )
+ if(req.http.Host ~ (?i)(^|\.)wikidata\.org$ req.http.Cookie ~
centralauth_Session.*centralauth_Session) {
+ // The exact format of the cookie-delete string is copied from
examples of normal CA cookie deletes (e.g. for logouts?) seen in traffic logs
+ header.append(resp.http.Set-Cookie,
centralauth_Session=deleted; expires=Thu, 01-Jan-1970 00:00:01 GMT; Max-Age=0;
path=/; domain=.wikidata.org; secure; httponly);
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/234510
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0046aef6d8b294d9d079d778f72ee19e3085c751
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: JanZerebecki jan.wikime...@zerebecki.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Support for 'filter' search operator. - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Support for 'filter' search operator.
..
Support for 'filter' search operator.
Bug: T97944
Change-Id: I99243394655c85b576674f8286ad2e6147e8c54c
---
M resources/js/ext.translate.special.searchtranslations.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.translate.special.searchtranslations.js
b/resources/js/ext.translate.special.searchtranslations.js
index 08bb3c1..835d078 100644
--- a/resources/js/ext.translate.special.searchtranslations.js
+++ b/resources/js/ext.translate.special.searchtranslations.js
@@ -345,7 +345,7 @@
var matches,
counter = false,
// Add operators for different filters
- operatorRegex = [ 'language' , 'group' ];
+ operatorRegex = [ 'language' , 'group', 'filter' ];
$.each( operatorRegex, function ( index, value ) {
var regex = new RegExp( value + ':(\\S+)', 'i' );
--
To view, visit https://gerrit.wikimedia.org/r/232768
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I99243394655c85b576674f8286ad2e6147e8c54c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Phoenix303 divyalife...@gmail.com
Gerrit-Reviewer: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Support for search operators. - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Support for search operators.
..
Support for search operators.
Use search operators to get more specific search results.
Examples:
wiki language:hi
wiki language:hi group:mediawiki
Bug: T97943
Change-Id: I861934132cabce80cef6d69fb8f8c61057439662
---
M resources/js/ext.translate.special.searchtranslations.js
M specials/SpecialSearchTranslations.php
2 files changed, 64 insertions(+), 1 deletion(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.translate.special.searchtranslations.js
b/resources/js/ext.translate.special.searchtranslations.js
index f5e4613..08bb3c1 100644
--- a/resources/js/ext.translate.special.searchtranslations.js
+++ b/resources/js/ext.translate.special.searchtranslations.js
@@ -23,6 +23,29 @@
$messages.last().addClass( 'last-message' );
+ $( '.tux-searchpage .button' ).click( function () {
+ var query = $( '.tux-searchpage .searchinputbox'
).val(),
+ result = lexOperators( query ),
+ $form = $( '.tux-searchpage
form[name=searchform]' );
+
+ $.each( result, function ( index, value ) {
+ var $input = $( 'input')
+ .prop( 'type', 'hidden' ),
+ $elem = $form.find( 'input[name=' +
index + ']' );
+
+ if ( $elem.length ) {
+ $elem.val( value );
+ } else {
+ $form.append( $input
+ .prop( {
+ value: value,
+ name: index
+ } )
+ );
+ }
+ } );
+ } );
+
buildSelectedBox();
showLanguages();
showMessageGroups();
@@ -299,6 +322,46 @@
}
}
+ function lexOperators( str ) {
+ var string = str.split( ' ' ),
+ result= {},
+ query = '';
+
+ $.each( string, function ( index, value ) {
+ matchOperators( value, function( obj ) {
+ if ( obj === false ) {
+ query = query + ' ' + value;
+ } else {
+ result[ obj.operator ] = obj.value;
+ }
+ } );
+ } );
+ result.query = query.trim();
+
+ return result;
+ }
+
+ function matchOperators( str, callback ) {
+ var matches,
+ counter = false,
+ // Add operators for different filters
+ operatorRegex = [ 'language' , 'group' ];
+
+ $.each( operatorRegex, function ( index, value ) {
+ var regex = new RegExp( value + ':(\\S+)', 'i' );
+ if ( ( matches = regex.exec( str ) ) !== null ) {
+ counter = true;
+ callback( {
+ operator: value,
+ value: matches[1]
+ } );
+ }
+ } );
+ if ( !counter ) {
+ callback( false );
+ }
+ }
+
function sortGroups( groupIdA, groupIdB ) {
var groupAName = mw.translate.findGroup( groupIdA, resultGroups
).count,
groupBName = mw.translate.findGroup( groupIdB,
resultGroups ).count;
diff --git a/specials/SpecialSearchTranslations.php
b/specials/SpecialSearchTranslations.php
index b3023f4..c0912ee 100644
--- a/specials/SpecialSearchTranslations.php
+++ b/specials/SpecialSearchTranslations.php
@@ -517,7 +517,7 @@
$lang = $this-getRequest()-getVal( 'language' );
$language = is_null( $lang ) ? '' : Html::hidden( 'language',
$lang );
- $form = Html::rawElement( 'form', array( 'action' = wfScript()
),
+ $form = Html::rawElement( 'form', array( 'action' =
wfScript(), 'name' = 'searchform' ),
$title . $input . $submit . $checkLabel . $language
);
--
To view, visit https://gerrit.wikimedia.org/r/211084
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id:
[MediaWiki-commits] [Gerrit] BSSkin: Fixed title tooltip for watch content action - change (mediawiki...BlueSpiceSkin)
Pwirth has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234518
Change subject: BSSkin: Fixed title tooltip for watch content action
..
BSSkin: Fixed title tooltip for watch content action
Change-Id: I1b72eafd22d648d88d5051d7d6b5a75994a64c11
---
M resources/components/skin.contentActions.less
1 file changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin
refs/changes/18/234518/1
diff --git a/resources/components/skin.contentActions.less
b/resources/components/skin.contentActions.less
index 1c2fc25..4e5eb1d 100644
--- a/resources/components/skin.contentActions.less
+++ b/resources/components/skin.contentActions.less
@@ -54,12 +54,14 @@
margin-right: 8px;
color: @bs-color-dark-blue;
a{
- width: 13px;
- height: 13px;
+ display: block;
+ position: relative;
+ width: 15px;
+ height: 16px;
overflow: hidden;
margin-top: -13px;
padding: 0;
- text-indent: 20px;
+ text-indent: -178px;
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/234518
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b72eafd22d648d88d5051d7d6b5a75994a64c11
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Pwirth wi...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix keys for labels and descriptions in JSON API - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review. https://gerrit.wikimedia.org/r/234528 Change subject: Fix keys for labels and descriptions in JSON API .. Fix keys for labels and descriptions in JSON API This broke incorrectly after the recent breaking change patch. Bug: T110668 Change-Id: If1b829af2f08cbd6e4e6c85af5bc6d83bd495e35 --- M repo/includes/api/ResultBuilder.php 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/28/234528/1 diff --git a/repo/includes/api/ResultBuilder.php b/repo/includes/api/ResultBuilder.php index 3012e47..3ed4213 100644 --- a/repo/includes/api/ResultBuilder.php +++ b/repo/includes/api/ResultBuilder.php @@ -525,8 +525,7 @@ $serialization, $path, $this-callbackFactory-getCallbackToSetArrayType( - ( $keyName === null ? 'array' : 'kvp' ), - $keyName + 'kvp' ) ); } -- To view, visit https://gerrit.wikimedia.org/r/234528 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If1b829af2f08cbd6e4e6c85af5bc6d83bd495e35 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Addshore addshorew...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improve description for statsistics-privatedata-users group ... - change (operations/puppet)
Ottomata has submitted this change and it was merged. Change subject: Improve description for statsistics-privatedata-users group in data.yaml .. Improve description for statsistics-privatedata-users group in data.yaml Change-Id: I7f2f2f650cef8a8feb41c74452af40f9c360f302 --- M modules/admin/data/data.yaml 1 file changed, 6 insertions(+), 2 deletions(-) Approvals: Ottomata: Verified; Looks good to me, approved diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index d2ea6e4..f13a8c8 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -160,8 +160,12 @@ members: [ezachte, joal, milimetric, tomasz, tnegrin] statistics-privatedata-users: gid: 725 -description: Have access to so that they can do analysis on webrequest logs -and other private data. +description: Access to stat boxes that host private data, including + sampled webrequest logs. This does not (necessarily) + grant access to Hadoop. If someone wants access to + stat1002 to access webrequest logs in the Hadoop cluster + you should put them in the analytics-privatedata-users + group. members: [handrade, haithams, ezachte, milimetric, dartar, yurik, halfak, awight, dr0ptp4kt, tnegrin, nuria, leila, manybubbles, ironholds, kleduc, ellery, nettrom, mforns, -- To view, visit https://gerrit.wikimedia.org/r/233985 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7f2f2f650cef8a8feb41c74452af40f9c360f302 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ottomata o...@wikimedia.org Gerrit-Reviewer: Ottomata o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix drop and drop hover exception in Firefox - change (oojs/ui)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234529
Change subject: Fix drop and drop hover exception in Firefox
..
Fix drop and drop hover exception in Firefox
dt.types.indexOf doesn't work because dt.types is only Array-like.
Change-Id: Ib20625a7160456b36e77e7a905fc2f5ad3ae39d2
Bonus: refactor code and comments for clarity.
---
M src/widgets/SelectFileWidget.js
1 file changed, 17 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/29/234529/1
diff --git a/src/widgets/SelectFileWidget.js b/src/widgets/SelectFileWidget.js
index ac8945b..726a599 100644
--- a/src/widgets/SelectFileWidget.js
+++ b/src/widgets/SelectFileWidget.js
@@ -312,7 +312,8 @@
* @param {jQuery.Event} e Drag event
*/
OO.ui.SelectFileWidget.prototype.onDragEnterOrOver = function ( e ) {
- var file = null,
+ var file,
+ droppbaleFile = false,
dt = e.originalEvent.dataTransfer;
e.preventDefault();
@@ -325,23 +326,22 @@
return false;
}
- if ( dt dt.files dt.files[ 0 ] ) {
- file = dt.files[ 0 ];
- if ( !this.isFileAcceptable( file ) ) {
- file = null;
- }
- } else if ( dt dt.types dt.types.indexOf( 'Files' ) !== -1 ) {
- // We know we have files so set 'file' to something truthy, we
just
- // can't know any details about them.
- // * https://bugzilla.mozilla.org/show_bug.cgi?id=640534
- file = 'Files exist, but details are unknown';
- }
+ file = OO.getProp( dt, 'files', 0 );
if ( file ) {
- this.$element.addClass( 'oo-ui-selectFileWidget-canDrop' );
- this.setActive( true );
- } else {
- this.$element.removeClass( 'oo-ui-selectFileWidget-canDrop' );
- this.setActive( false );
+ if ( this.isFileAcceptable( file ) ) {
+ droppbaleFile = true;
+ }
+ // dt.types is Array-like, but not an Array
+ } else if ( Array.prototype.indexOf.call( OO.getProp( dt, 'types' ) ||
[], 'Files' ) !== -1 ) {
+ // File information is not available at this point for security
so just assume
+ // it is acceptable for now.
+ // https://bugzilla.mozilla.org/show_bug.cgi?id=640534
+ droppbaleFile = true;
+ }
+
+ this.$element.toggleClass( 'oo-ui-selectFileWidget-canDrop',
droppbaleFile );
+ this.setActive( droppbaleFile );
+ if ( !droppbaleFile ) {
dt.dropEffect = 'none';
}
--
To view, visit https://gerrit.wikimedia.org/r/234529
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib20625a7160456b36e77e7a905fc2f5ad3ae39d2
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Keep the uploads sorted in the order they were created in in... - change (mediawiki...UploadWizard)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234530
Change subject: Keep the uploads sorted in the order they were created in
initially
..
Keep the uploads sorted in the order they were created in initially
It might be better to track this issue down to the source and find out
the point where the order changes, but the data flow here is scary.
Bug: T92801
Change-Id: I338a0941467fa2d7a5e79760e5f156de48fe07a4
---
M resources/controller/uw.controller.Step.js
1 file changed, 12 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/30/234530/1
diff --git a/resources/controller/uw.controller.Step.js
b/resources/controller/uw.controller.Step.js
index 7c24c03..df61591 100644
--- a/resources/controller/uw.controller.Step.js
+++ b/resources/controller/uw.controller.Step.js
@@ -85,6 +85,18 @@
this.uploads = uploads || [];
+ // Keep the uploads sorted in the order they were created in
initially.
+ this.uploads = this.uploads.sort( function ( uploadA, uploadB )
{
+ // Can the uploads be undefined? Code below would imply
they can, no idea how.
+ if ( !uploadA ) {
+ return 1;
+ }
+ if ( !uploadB ) {
+ return -1;
+ }
+ return uploadA.index - uploadB.index;
+ } );
+
$.each( this.uploads, function ( i, upload ) {
if ( upload !== undefined ) {
upload.state = step.stepName;
--
To view, visit https://gerrit.wikimedia.org/r/234530
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I338a0941467fa2d7a5e79760e5f156de48fe07a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improve type checking in SelectFileWidget - change (oojs/ui)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234540
Change subject: Improve type checking in SelectFileWidget
..
Improve type checking in SelectFileWidget
Use data transfer items in Chrome as these actually have mime type
information available. Change mime checker function to take strings
as we don't always pass Files.
Change-Id: I2c7fe8891912a44c6b681a3e27c83ffcb6015a48
---
M src/widgets/SelectFileWidget.js
1 file changed, 18 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/40/234540/1
diff --git a/src/widgets/SelectFileWidget.js b/src/widgets/SelectFileWidget.js
index 726a599..c34d5fb 100644
--- a/src/widgets/SelectFileWidget.js
+++ b/src/widgets/SelectFileWidget.js
@@ -234,24 +234,23 @@
* Determine if we should accept this file
*
* @private
- * @param {File} file
+ * @param {string} File MIME type
* @return {boolean}
*/
-OO.ui.SelectFileWidget.prototype.isFileAcceptable = function ( file ) {
- var i, mime, mimeTest;
+OO.ui.SelectFileWidget.prototype.isAllowedType = function ( mimeType ) {
+ var i, mimeTest;
- if ( !this.accept || file.type === '' ) {
+ if ( !this.accept || !mimeType ) {
return true;
}
- mime = file.type;
for ( i = 0; i this.accept.length; i++ ) {
mimeTest = this.accept[ i ];
- if ( mimeTest === mime ) {
+ if ( mimeTest === mimeType ) {
return true;
} else if ( mimeTest.substr( -2 ) === '/*' ) {
mimeTest = mimeTest.substr( 0, mimeTest.length - 1 );
- if ( mime.substr( 0, mimeTest.length ) === mimeTest ) {
+ if ( mimeType.substr( 0, mimeTest.length ) === mimeTest
) {
return true;
}
}
@@ -267,13 +266,10 @@
* @param {jQuery.Event} e
*/
OO.ui.SelectFileWidget.prototype.onFileSelected = function ( e ) {
- var file = null;
+ var file = OO.getProp( e.target, 'files', 0 ) || null;
- if ( e.target.files e.target.files[ 0 ] ) {
- file = e.target.files[ 0 ];
- if ( !this.isFileAcceptable( file ) ) {
- file = null;
- }
+ if ( file !this.isAllowedType( file.type ) ) {
+ file = null;
}
this.setValue( file );
@@ -312,7 +308,7 @@
* @param {jQuery.Event} e Drag event
*/
OO.ui.SelectFileWidget.prototype.onDragEnterOrOver = function ( e ) {
- var file,
+ var itemOrFile,
droppbaleFile = false,
dt = e.originalEvent.dataTransfer;
@@ -326,9 +322,11 @@
return false;
}
- file = OO.getProp( dt, 'files', 0 );
- if ( file ) {
- if ( this.isFileAcceptable( file ) ) {
+ // DataTransferItem and File both have a type property, but in Chrome
files
+ // have no information at this point.
+ itemOrFile = OO.getProp( dt, 'items', 0 ) || OO.getProp( dt, 'files', 0
);
+ if ( itemOrFile ) {
+ if ( this.isAllowedType( itemOrFile.type ) ) {
droppbaleFile = true;
}
// dt.types is Array-like, but not an Array
@@ -378,11 +376,9 @@
return false;
}
- if ( dt dt.files dt.files[ 0 ] ) {
- file = dt.files[ 0 ];
- if ( !this.isFileAcceptable( file ) ) {
- file = null;
- }
+ file = OO.getProp( dt, 'files', 0 );
+ if ( file !this.isAllowedType( file.type ) ) {
+ file = null;
}
if ( file ) {
this.setValue( file );
--
To view, visit https://gerrit.wikimedia.org/r/234540
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c7fe8891912a44c6b681a3e27c83ffcb6015a48
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Initial import - change (CLDRPluralRuleParser)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/234542 Change subject: Initial import .. Initial import Extracted from MediaWiki Change-Id: Iefcb14e6a0d07fe18e1b621cbd767d986db0dcc1 --- A .gitattributes A .gitignore A COPYING A README.md A composer.json A phpcs.xml A phpunit.xml.dist A src/Converter.php A src/Converter/Expression.php A src/Converter/Fragment.php A src/Converter/Operator.php A src/Error.php A src/Evaluator.php A src/Range.php A tests/EvaluatorTest.php 15 files changed, 1,413 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/CLDRPluralRuleParser refs/changes/42/234542/1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000..c932927 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,8 @@ +.gitattributes export-ignore +.gitignore export-ignore +.gitreview export-ignore +.jshintrc export-ignore +composer.json export-ignore +phpcs.xml export-ignore +phpunit.xml.dist export-ignore +tests/ export-ignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..de4a392 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/vendor +/composer.lock diff --git a/COPYING b/COPYING new file mode 100644 index 000..d159169 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + +GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The Program, below, +refers to any such program or work, and a work based on the Program +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term
[MediaWiki-commits] [Gerrit] SpecialGoToLinkedPage: use HTMLForm::setWrapperLegendMsg() i... - change (mediawiki...Wikibase)
Ricordisamoa has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234545
Change subject: SpecialGoToLinkedPage: use HTMLForm::setWrapperLegendMsg()
instead of 'section'
..
SpecialGoToLinkedPage: use HTMLForm::setWrapperLegendMsg() instead of 'section'
Change-Id: I1ba76160cd97234882d6330c874588d1e8abc1c8
---
M repo/includes/specials/SpecialGoToLinkedPage.php
1 file changed, 1 insertion(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/45/234545/1
diff --git a/repo/includes/specials/SpecialGoToLinkedPage.php
b/repo/includes/specials/SpecialGoToLinkedPage.php
index e5937f9..1a86194 100644
--- a/repo/includes/specials/SpecialGoToLinkedPage.php
+++ b/repo/includes/specials/SpecialGoToLinkedPage.php
@@ -225,11 +225,9 @@
protected function outputForm( $site, $itemString ) {
$this-getOutput()-addModules(
'wikibase.special.goToLinkedPage' );
- // The message for the fieldset's legend is
wikibase-gotolinkedpage-lookup-fieldset
$formDescriptor = array(
'site' = array(
'name' = 'site',
- 'section' = 'gotolinkedpage-lookup-fieldset',
'default' = $site ?: '',
'type' = 'text',
'id' = 'wb-gotolinkedpage-sitename',
@@ -238,7 +236,6 @@
),
'itemid' = array(
'name' = 'itemid',
- 'section' = 'gotolinkedpage-lookup-fieldset',
'default' = $itemString ?: '',
'type' = 'text',
'id' = 'wb-gotolinkedpage-itemid',
@@ -248,7 +245,6 @@
),
'submit' = array(
'name' = 'submit',
- 'section' = 'gotolinkedpage-lookup-fieldset',
'default' = $this-msg(
'wikibase-gotolinkedpage-submit' )-text(),
'type' = 'submit',
'id' = 'wb-gotolinkedpage-submit',
@@ -259,6 +255,7 @@
HTMLForm::factory( 'inline', $formDescriptor,
$this-getContext(), 'wikibase' )
-setId( 'wb-gotolinkedpage-form1' )
-setMethod( 'get' )
+ -setWrapperLegendMsg(
'wikibase-gotolinkedpage-lookup-fieldset' )
-suppressDefaultSubmit()
-setSubmitCallback( function () {// no-op
} )-show();
--
To view, visit https://gerrit.wikimedia.org/r/234545
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ba76160cd97234882d6330c874588d1e8abc1c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa ricordisa...@openmailbox.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't alert on stopped eventlogging jobs on analytics1010 - change (operations/puppet)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234546
Change subject: Don't alert on stopped eventlogging jobs on analytics1010
..
Don't alert on stopped eventlogging jobs on analytics1010
Change-Id: I0d325800554eb23bcc18d1d4e6300eff46200f4d
---
M manifests/role/eventlogging.pp
M modules/eventlogging/manifests/monitoring/jobs.pp
2 files changed, 15 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/46/234546/1
diff --git a/manifests/role/eventlogging.pp b/manifests/role/eventlogging.pp
index 213f0bc..6eeaac6 100644
--- a/manifests/role/eventlogging.pp
+++ b/manifests/role/eventlogging.pp
@@ -62,8 +62,6 @@
class { '::eventlogging': }
-# make sure any defined eventlogging services are running
-class { '::eventlogging::monitoring::jobs': }
if $::standard::has_ganglia {
class { '::eventlogging::monitoring::ganglia': }
@@ -71,6 +69,7 @@
# This check was written for eventlog1001, so only include it there.,
if $::hostname == 'eventlog1001' {
+
# Alert when / gets low. (eventlog1001 has a 9.1G /)
nrpe::monitor_service { 'eventlogging_root_disk_space':
description = 'Eventlogging / disk space',
@@ -88,6 +87,18 @@
contact_group = 'analytics',
}
}
+
+
+# analytics1010 is temporarily being used as a staging perf test
+# host for the EventLogging on Kafka project. Disable job alerts there.
+$monitor_jobs_ensure = $::hostname ? {
+'analytics1010' = 'absent',
+default = 'present',
+}
+# make sure any defined eventlogging services are running
+class { '::eventlogging::monitoring::jobs':
+ensure = $monitor_jobs_ensure,
+}
}
diff --git a/modules/eventlogging/manifests/monitoring/jobs.pp
b/modules/eventlogging/manifests/monitoring/jobs.pp
index 96032da..799e59b 100644
--- a/modules/eventlogging/manifests/monitoring/jobs.pp
+++ b/modules/eventlogging/manifests/monitoring/jobs.pp
@@ -3,14 +3,14 @@
# Installs an icinga check to make sure all defined
# eventlogging services are running.
#
-class eventlogging::monitoring::jobs {
+class eventlogging::monitoring::jobs(ensure = 'present') {
file { '/usr/lib/nagios/plugins/check_eventlogging_jobs':
source = 'puppet:///modules/eventlogging/check_eventlogging_jobs',
mode = '0755',
}
nrpe::monitor_service { 'eventlogging-jobs':
-ensure= 'present',
+ensure= $ensure,
description = 'Check status of defined EventLogging jobs',
nrpe_command = '/usr/lib/nagios/plugins/check_eventlogging_jobs',
require =
File['/usr/lib/nagios/plugins/check_eventlogging_jobs'],
--
To view, visit https://gerrit.wikimedia.org/r/234546
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d325800554eb23bcc18d1d4e6300eff46200f4d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Turn off batching to get baseline perf numbers in rt testing - change (mediawiki...parsoid)
Subramanya Sastry has uploaded a new change for review. https://gerrit.wikimedia.org/r/234547 Change subject: Turn off batching to get baseline perf numbers in rt testing .. Turn off batching to get baseline perf numbers in rt testing Change-Id: I8a3bc9f40d6cad192b11d12663a1dff981e508ee --- M tests/rttest.localsettings.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/47/234547/1 diff --git a/tests/rttest.localsettings.js b/tests/rttest.localsettings.js index bc7f248..3714da1 100644 --- a/tests/rttest.localsettings.js +++ b/tests/rttest.localsettings.js @@ -18,7 +18,7 @@ } // Turn on the batching API - parsoidConfig.useBatchAPI = true; + // parsoidConfig.useBatchAPI = true; // We pre-define wikipedias as 'enwiki', 'dewiki' etc. Similarly // for other projects: 'enwiktionary', 'enwikiquote', 'enwikibooks', -- To view, visit https://gerrit.wikimedia.org/r/234547 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a3bc9f40d6cad192b11d12663a1dff981e508ee Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] elasticsearch: ferm for 14-17 - change (operations/puppet)
Rush has submitted this change and it was merged.
Change subject: elasticsearch: ferm for 14-17
..
elasticsearch: ferm for 14-17
Change-Id: I3c9614d5082ce0df240c17e902e707006698cc83
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Rush: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 9c57f86..27d298e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -847,7 +847,7 @@
role elasticsearch::server
-if $::hostname =~ /^elastic10(1[8-9]|2[0-9]|3[0-1])$/ {
+if $::hostname =~ /^elastic10(1[4-9]|2[0-9]|3[0-1])$/ {
include base::firewall
}
}
--
To view, visit https://gerrit.wikimedia.org/r/234550
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3c9614d5082ce0df240c17e902e707006698cc83
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush r...@wikimedia.org
Gerrit-Reviewer: Rush r...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump src to b52ac7fa for release of 0.4.0 - change (mediawiki...deploy)
Cscott has uploaded a new change for review. https://gerrit.wikimedia.org/r/234552 Change subject: Bump src to b52ac7fa for release of 0.4.0 .. Bump src to b52ac7fa for release of 0.4.0 Change-Id: Ib998430f61c1ece4fc57f08ad36bce852c0d9305 --- M src 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/deploy refs/changes/52/234552/1 diff --git a/src b/src index 44d657d..b52ac7f 16 --- a/src +++ b/src -Subproject commit 44d657de98f38460a4bc4932c336cad20a3ed340 +Subproject commit b52ac7fa92ac60921ce3c20718643ba143bcac95 -- To view, visit https://gerrit.wikimedia.org/r/234552 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib998430f61c1ece4fc57f08ad36bce852c0d9305 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid/deploy Gerrit-Branch: master Gerrit-Owner: Cscott canan...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] elasticsearch: ferm for [8-9][10-13] - change (operations/puppet)
Rush has submitted this change and it was merged.
Change subject: elasticsearch: ferm for [8-9][10-13]
..
elasticsearch: ferm for [8-9][10-13]
Change-Id: Ieea81bcf3b623b41774da6076b6122e8985fa880
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Rush: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 27d298e..957f934 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -847,7 +847,7 @@
role elasticsearch::server
-if $::hostname =~ /^elastic10(1[4-9]|2[0-9]|3[0-1])$/ {
+if $::hostname =~ /^elastic10(0[8-9]|1[0-9]|2[0-9]|3[0-1])$/ {
include base::firewall
}
}
--
To view, visit https://gerrit.wikimedia.org/r/234557
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieea81bcf3b623b41774da6076b6122e8985fa880
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush r...@wikimedia.org
Gerrit-Reviewer: Rush r...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed Style/StringLiterals RuboCop offense - change (mediawiki...WikiLove)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/234534 Change subject: Fixed Style/StringLiterals RuboCop offense .. Fixed Style/StringLiterals RuboCop offense Bug: T110672 Change-Id: I552e8c7ad4d0b377046ba47f9f5ed5a37e02d041 --- M .rubocop.yml D .rubocop_todo.yml M Gemfile M tests/browser/features/support/env.rb M tests/browser/features/support/pages/wikilove_page.rb 5 files changed, 22 insertions(+), 38 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiLove refs/changes/34/234534/1 diff --git a/.rubocop.yml b/.rubocop.yml index d2ca1a1..84567a5 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,5 +1,3 @@ -inherit_from: .rubocop_todo.yml - AllCops: StyleGuideCopsOnly: true @@ -15,9 +13,8 @@ Style/SignalException: Enabled: false -# Uncomment when the time comes -# Style/StringLiterals: -# EnforcedStyle: single_quotes +Style/StringLiterals: + EnforcedStyle: single_quotes Style/TrivialAccessors: ExactNameMatch: true diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml deleted file mode 100644 index 22ffbe2..000 --- a/.rubocop_todo.yml +++ /dev/null @@ -1,13 +0,0 @@ -# This configuration was generated by -# `rubocop --auto-gen-config` -# on 2015-08-28 16:11:01 +0200 using RuboCop version 0.33.0. -# The point is for the user to remove these configuration records -# one by one as the offenses are removed from the code base. -# Note that changes in the inspected code, or installation of new -# versions of RuboCop, may require this file to be generated again. - -# Offense count: 22 -# Cop supports --auto-correct. -# Configuration parameters: SupportedStyles. -Style/StringLiterals: - EnforcedStyle: double_quotes diff --git a/Gemfile b/Gemfile index ee5cf1c..e2fc59d 100755 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -source https://rubygems.org; +source 'https://rubygems.org' -gem mediawiki_selenium, ~ 1.5.0 -gem rubocop, 0.33.0, require: false +gem 'mediawiki_selenium', '~ 1.5.0' +gem 'rubocop', '0.33.0', require: false diff --git a/tests/browser/features/support/env.rb b/tests/browser/features/support/env.rb index 57f3e6b..5eff4ce 100644 --- a/tests/browser/features/support/env.rb +++ b/tests/browser/features/support/env.rb @@ -1,4 +1,4 @@ -require mediawiki_selenium +require 'mediawiki_selenium' -require mediawiki_selenium/support -require mediawiki_selenium/step_definitions +require 'mediawiki_selenium/support' +require 'mediawiki_selenium/step_definitions' diff --git a/tests/browser/features/support/pages/wikilove_page.rb b/tests/browser/features/support/pages/wikilove_page.rb index b69214f..297bc8a 100644 --- a/tests/browser/features/support/pages/wikilove_page.rb +++ b/tests/browser/features/support/pages/wikilove_page.rb @@ -9,23 +9,23 @@ # WikiLove top-level directory and at # https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FWikiLove/HEAD/CREDITS # -require page-object +require 'page-object' class WikilovePage include PageObject - page_url User:Selenium_user2 + page_url 'User:Selenium_user2' - select_list(:barnstar_select, id: mw-wikilove-subtype) - span(:barnstars, text: Barnstars) - span(:food_and_drink, text: Food and drink) - select_list(:food_drink_select, id: mw-wikilove-subtype) - text_field(:food_header, id: mw-wikilove-header) - a(:heart, text: WikiLove) - text_field(:kitten_header, id: mw-wikilove-header) - a(:kitten_image, id: mw-wikilove-gallery-img-0) - span(:kittens, text: Kittens) - text_area(:wikilove_message, id: mw-wikilove-message) - div(:wikilove_spinner, id: mw-wikilove-image-preview-spinner) - div(:wikilove_window, class: ui-dialog ui-widget ui-widget-content ui-corner-all ui-draggable) + select_list(:barnstar_select, id: 'mw-wikilove-subtype') + span(:barnstars, text: 'Barnstars') + span(:food_and_drink, text: 'Food and drink') + select_list(:food_drink_select, id: 'mw-wikilove-subtype') + text_field(:food_header, id: 'mw-wikilove-header') + a(:heart, text: 'WikiLove') + text_field(:kitten_header, id: 'mw-wikilove-header') + a(:kitten_image, id: 'mw-wikilove-gallery-img-0') + span(:kittens, text: 'Kittens') + text_area(:wikilove_message, id: 'mw-wikilove-message') + div(:wikilove_spinner, id: 'mw-wikilove-image-preview-spinner') + div(:wikilove_window, class: 'ui-dialog ui-widget ui-widget-content ui-corner-all ui-draggable') end -- To view, visit https://gerrit.wikimedia.org/r/234534 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I552e8c7ad4d0b377046ba47f9f5ed5a37e02d041 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikiLove Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set log levels for pykafka and kazoo to info - change (mediawiki...EventLogging)
Ottomata has uploaded a new change for review. https://gerrit.wikimedia.org/r/234541 Change subject: Set log levels for pykafka and kazoo to info .. Set log levels for pykafka and kazoo to info Change-Id: I91db93f1e85ec635dc474957a43126c93cb14968 --- M server/eventlogging/utils.py 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventLogging refs/changes/41/234541/1 diff --git a/server/eventlogging/utils.py b/server/eventlogging/utils.py index d4b6e93..a12e5c9 100644 --- a/server/eventlogging/utils.py +++ b/server/eventlogging/utils.py @@ -196,5 +196,7 @@ logging.basicConfig(stream=sys.stderr, level=eventlogging_log_level, format='%(asctime)s (%(threadName)-10s) %(message)s') -# Set kafka module logging level to INFO, DEBUG is too noisy. +# Set module logging level to INFO, DEBUG is too noisy. logging.getLogger(kafka).setLevel(logging.INFO) +logging.getLogger(pykafka).setLevel(logging.INFO) +logging.getLogger(kazoo).setLevel(logging.INFO) -- To view, visit https://gerrit.wikimedia.org/r/234541 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I91db93f1e85ec635dc474957a43126c93cb14968 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/EventLogging Gerrit-Branch: master Gerrit-Owner: Ottomata o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ssl_ciphersite: bugfix for apache-2.4.8+ DHE selection - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: ssl_ciphersite: bugfix for apache-2.4.8+ DHE selection
..
ssl_ciphersite: bugfix for apache-2.4.8+ DHE selection
Change-Id: I4101b7a1b962854e5decfc4003e547f2d9c46e85
---
M modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
JanZerebecki: Looks good to me, but someone else must approve
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
b/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
index 78f0d49..5e0fb81 100644
--- a/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
@@ -176,7 +176,10 @@
# append dhe params to the server cert file, which would be difficult to
# factor in with sslcert puppetization and such. Possible TODO if we're
# really stuck on this?
-if server == 'apache' lookupvar('lsbdistrelease').capitalize != 'Jessie'
+#
+# what we really want here is a check on the actual installed apache
+# version = 2.4.8, rather than checking for exactly Debian Jessie.
+if server == 'apache' lookupvar('lsbdistcodename').capitalize !=
'Jessie'
Puppet.warning('ssl_ciphersuite(): DHE ciphers disabled - upgrade to
Jessie+Apache2.4!')
cipherlist = ciphersuites[ciphersuite].reject{|x| x =~ /^DHE-/}.join(:)
set_dhparam = false
--
To view, visit https://gerrit.wikimedia.org/r/234512
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4101b7a1b962854e5decfc4003e547f2d9c46e85
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ssl_ciphersuite: disable DHE for apache for now - change (operations/puppet)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234551
Change subject: ssl_ciphersuite: disable DHE for apache for now
..
ssl_ciphersuite: disable DHE for apache for now
Change-Id: I80ada9fb7c4b2f55731bd1de2bddd14f6f38b877
---
M modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
1 file changed, 4 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/51/234551/1
diff --git a/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
b/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
index 5e0fb81..709e906 100644
--- a/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
@@ -171,16 +171,10 @@
fail(ArgumentError, 'ssl_ciphersuite(): apache 2.2 can only be used with
compat')
end
-# no DHE for apache unless jessie (2.4.10)
-# trusty's apache-2.4.7 can technically do it as well, but only if we
-# append dhe params to the server cert file, which would be difficult to
-# factor in with sslcert puppetization and such. Possible TODO if we're
-# really stuck on this?
-#
-# what we really want here is a check on the actual installed apache
-# version = 2.4.8, rather than checking for exactly Debian Jessie.
-if server == 'apache' lookupvar('lsbdistcodename').capitalize !=
'Jessie'
- Puppet.warning('ssl_ciphersuite(): DHE ciphers disabled - upgrade to
Jessie+Apache2.4!')
+# We can't do proper DH params for DHE suites on any of our current apache
+# builds, actually, because they weren't built against openssl-1.0.2.
+# Disabling for now, until we come up with a better way to configure this
+if server == 'apache'
cipherlist = ciphersuites[ciphersuite].reject{|x| x =~ /^DHE-/}.join(:)
set_dhparam = false
else
--
To view, visit https://gerrit.wikimedia.org/r/234551
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I80ada9fb7c4b2f55731bd1de2bddd14f6f38b877
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update qqq.json messages - change (mediawiki...TimedMediaHandler)
jenkins-bot has submitted this change and it was merged.
Change subject: Update qqq.json messages
..
Update qqq.json messages
Make timedmedia-derivative optional
Change-Id: Id400b4bb56a841867a83416141475077c99a80f1
---
M i18n/qqq.json
1 file changed, 26 insertions(+), 26 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 22cda6b..4fe17fe 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -79,50 +79,50 @@
timedmedia-source-file: The source file. Parameters:\n* $1 - file
type; any one of the following messages:\n** {{msg-mw|Timedmedia-ogg}}\n**
{{msg-mw|Timedmedia-webm}}\n** {{msg-mw|Timedmedia-mp4}}\n**
{{msg-mw|Timedmedia-flac}}\n** {{msg-mw|Timedmedia-wav}}\nSee also:\n*
{{msg-mw|Timedmedia-source-audio-file-desc}}\n*
{{msg-mw|Timedmedia-source-file-desc}}\n{{Identical|Source}},
timedmedia-source-file-desc: Source file description. This is a file
title in the primary source attributes of a timed media file. I can look like
\''Original Ogg file, 640 × 480 (10 Mbps)''\.\n\nParameters:\n* $1 - file
type; any one of the following messages:\n** {{msg-mw|Timedmedia-ogg}}\n**
{{msg-mw|Timedmedia-webm}}\n** {{msg-mw|Timedmedia-mp4}}\n**
{{msg-mw|Timedmedia-flac}}\n** {{msg-mw|Timedmedia-wav}}\n* $2 - resolution
width\n* $3 - resolution height\n* $4 - human readable bitrate\nSee also:\n*
{{msg-mw|Timedmedia-source-audio-file-desc}} - for audio file,
timedmedia-source-audio-file-desc: Source file description.
Parameters:\n* $1 - file type; any one of the following messages:\n**
{{msg-mw|Timedmedia-ogg}}\n** {{msg-mw|Timedmedia-webm}}\n**
{{msg-mw|Timedmedia-mp4}}\n** {{msg-mw|Timedmedia-flac}}\n**
{{msg-mw|Timedmedia-wav}}\n* $2 - human readable bitrate\nSee also:\n*
{{msg-mw|Timedmedia-source-file-desc}} - for video file,
- timedmedia-derivative-160p.ogv: {{optional}} A type of media format
encoding,
+ timedmedia-derivative-160p.ogv: {{optional}} A type of media format
encoding,
timedmedia-derivative-desc-160p.ogv: {{optional}} A type of media
format encoding,
- timedmedia-derivative-240p.ogv: {{optional}} A type of media format
encoding,
+ timedmedia-derivative-240p.ogv: {{optional}} A type of media format
encoding,
timedmedia-derivative-desc-240p.ogv: {{optional}} A type of media
format encoding,
- timedmedia-derivative-360p.ogv: {{optional}} A type of media format
encoding,
+ timedmedia-derivative-360p.ogv: {{optional}} A type of media format
encoding,
timedmedia-derivative-desc-360p.ogv: {{optional}} A type of media
format encoding,
- timedmedia-derivative-480p.ogv: {{optional}} A type of media format
encoding,
+ timedmedia-derivative-480p.ogv: {{optional}} A type of media format
encoding,
timedmedia-derivative-desc-480p.ogv: {{optional}} A type of media
format encoding,
- timedmedia-derivative-720p.ogv: {{optional}} A type of media format
encoding,
+ timedmedia-derivative-720p.ogv: {{optional}} A type of media format
encoding,
timedmedia-derivative-desc-720p.ogv: {{optional}} A type of media
format encoding,
- timedmedia-derivative-1080p.ogv: {{optional}} A type of media
format encoding,
+ timedmedia-derivative-1080p.ogv: {{optional}} A type of media format
encoding,
timedmedia-derivative-desc-1080p.ogv: {{optional}} A type of media
format encoding,
- timedmedia-derivative-160p.webm: {{optional}} A type of media
format encoding,
+ timedmedia-derivative-160p.webm: {{optional}} A type of media format
encoding,
timedmedia-derivative-desc-160p.webm: {{optional}} A type of media
format encoding,
- timedmedia-derivative-360p.webm: {{optional}} A type of media
format encoding,
+ timedmedia-derivative-360p.webm: {{optional}} A type of media format
encoding,
timedmedia-derivative-desc-360p.webm: {{optional}} A type of media
format encoding,
- timedmedia-derivative-480p.webm: {{optional}} A type of media
format encoding,
+ timedmedia-derivative-480p.webm: {{optional}} A type of media format
encoding,
timedmedia-derivative-desc-480p.webm: {{optional}} A type of media
format encoding,
- timedmedia-derivative-720p.webm: {{optional}} A type of media
format encoding,
+ timedmedia-derivative-720p.webm: {{optional}} A type of media format
encoding,
timedmedia-derivative-desc-720p.webm: {{optional}} A type of media
format encoding,
- timedmedia-derivative-1080p.webm: {{optional}} A type of media
format encoding,
+ timedmedia-derivative-1080p.webm: {{optional}} A type of media
format encoding,
timedmedia-derivative-desc-1080p.webm: {{optional}} A type of media
format encoding,
- timedmedia-derivative-2160p.webm: {{optional}} A type of media
format encoding,
-
[MediaWiki-commits] [Gerrit] ssl_ciphersuite: disable DHE for apache for now - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: ssl_ciphersuite: disable DHE for apache for now
..
ssl_ciphersuite: disable DHE for apache for now
Change-Id: I80ada9fb7c4b2f55731bd1de2bddd14f6f38b877
---
M modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
1 file changed, 4 insertions(+), 10 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
b/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
index 5e0fb81..709e906 100644
--- a/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb
@@ -171,16 +171,10 @@
fail(ArgumentError, 'ssl_ciphersuite(): apache 2.2 can only be used with
compat')
end
-# no DHE for apache unless jessie (2.4.10)
-# trusty's apache-2.4.7 can technically do it as well, but only if we
-# append dhe params to the server cert file, which would be difficult to
-# factor in with sslcert puppetization and such. Possible TODO if we're
-# really stuck on this?
-#
-# what we really want here is a check on the actual installed apache
-# version = 2.4.8, rather than checking for exactly Debian Jessie.
-if server == 'apache' lookupvar('lsbdistcodename').capitalize !=
'Jessie'
- Puppet.warning('ssl_ciphersuite(): DHE ciphers disabled - upgrade to
Jessie+Apache2.4!')
+# We can't do proper DH params for DHE suites on any of our current apache
+# builds, actually, because they weren't built against openssl-1.0.2.
+# Disabling for now, until we come up with a better way to configure this
+if server == 'apache'
cipherlist = ciphersuites[ciphersuite].reject{|x| x =~ /^DHE-/}.join(:)
set_dhparam = false
else
--
To view, visit https://gerrit.wikimedia.org/r/234551
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I80ada9fb7c4b2f55731bd1de2bddd14f6f38b877
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update `repository` link in `package.json` - change (mediawiki...parsoid)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234555
Change subject: Update `repository` link in `package.json`
..
Update `repository` link in `package.json`
Although we prefer gerrit for code submissions, using the github URL
here is probably more useful.
Change-Id: Icc65d2bc28b09a890dfa0c8bc3ff162c0b0afb11
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/55/234555/1
diff --git a/package.json b/package.json
index a12ec4d..24ea407 100644
--- a/package.json
+++ b/package.json
@@ -60,6 +60,6 @@
},
repository: {
type: git,
-url: https://gerrit.wikimedia.org/r/p/mediawiki/services/parsoid;
+url: https://github.com/wikimedia/parsoid;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/234555
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc65d2bc28b09a890dfa0c8bc3ff162c0b0afb11
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott canan...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mailman: no gate_news debconf option on = jessie - change (operations/puppet)
Dzahn has submitted this change and it was merged.
Change subject: mailman: no gate_news debconf option on = jessie
..
mailman: no gate_news debconf option on = jessie
gate_news is mailman's newsgroup to mail gateway.
This option does not exist anymore in the jessie version of the
package.
@fermium:~# echo get mailman/gate_news | debconf-communicate
10 mailman/gate_news doesn't exist
@sodium:~# echo get mailman/gate_news | debconf-communicate
0 false
It causes puppet errors if we still try to set it on jessie:
Mailman::Listserve/Exec[dpkg-reconfigure mailman]:
Dependency Exec[debconf-communicate set mailman/gate_news] has failures: true
Bug:T109925
Change-Id: Ib01baf00aca8c978e34b9553e29d1ef1bffee702
---
M modules/mailman/manifests/listserve.pp
1 file changed, 6 insertions(+), 3 deletions(-)
Approvals:
JanZerebecki: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/mailman/manifests/listserve.pp
b/modules/mailman/manifests/listserve.pp
index e1cd3c5..4626f6b 100644
--- a/modules/mailman/manifests/listserve.pp
+++ b/modules/mailman/manifests/listserve.pp
@@ -13,9 +13,12 @@
# Install as many languages as possible
include locales::extended
-debconf::set { 'mailman/gate_news':
-value = 'false',
-notify = Exec['dpkg-reconfigure mailman'],
+if os_version ( 'debian = jessie || ubuntu = precise') {
+
+debconf::set { 'mailman/gate_news':
+value = 'false',
+notify = Exec['dpkg-reconfigure mailman'],
+}
}
debconf::set { 'mailman/site_languages':
--
To view, visit https://gerrit.wikimedia.org/r/234462
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib01baf00aca8c978e34b9553e29d1ef1bffee702
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.de
Gerrit-Reviewer: John F. Lewis johnflewi...@gmail.com
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] elasticsearch: ferm for [8-9][10-13] - change (operations/puppet)
Rush has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234557
Change subject: elasticsearch: ferm for [8-9][10-13]
..
elasticsearch: ferm for [8-9][10-13]
Change-Id: Ieea81bcf3b623b41774da6076b6122e8985fa880
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/57/234557/1
diff --git a/manifests/site.pp b/manifests/site.pp
index db676a8..208d02a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -855,7 +855,7 @@
role elasticsearch::server
-if $::hostname =~ /^elastic10(1[4-9]|2[0-9]|3[0-1])$/ {
+if $::hostname =~ /^elastic10(0[8-9]|1[0-9]|2[0-9]|3[0-1])$/ {
include base::firewall
}
}
--
To view, visit https://gerrit.wikimedia.org/r/234557
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieea81bcf3b623b41774da6076b6122e8985fa880
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush r...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] nodepool: update apt pinning - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234535
Change subject: nodepool: update apt pinning
..
nodepool: update apt pinning
Our Jessie servers no more included upstream jessie-backports. Update
the pinning to jessie-wikimedia/backports.
Bug: T110656
Change-Id: I61d99be3a735abe7f84dd5f4a9c63e3882839e25
---
M modules/nodepool/manifests/init.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/35/234535/1
diff --git a/modules/nodepool/manifests/init.pp
b/modules/nodepool/manifests/init.pp
index d3dc06c..abbfcc3 100644
--- a/modules/nodepool/manifests/init.pp
+++ b/modules/nodepool/manifests/init.pp
@@ -59,12 +59,12 @@
# Nodepool 0.1.0 requires novaclient=2.21.0
# Jessie has 2.18.1 (T104971)
apt::pin { 'python-novaclient':
-pin = 'release a=jessie-backports',
+pin = 'release a=jessie-wikimedia c=backports',
priority = '1001',
before = Package['nodepool'],
}
apt::pin { 'python-openstackclient':
-pin = 'release a=jessie-backports',
+pin = 'release a=jessie-wikimedia c=backports',
priority = '1001',
before = Package['nodepool'],
}
--
To view, visit https://gerrit.wikimedia.org/r/234535
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I61d99be3a735abe7f84dd5f4a9c63e3882839e25
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Be a little more conservative with the IPv6 support in the S... - change (mediawiki/core)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234536
Change subject: Be a little more conservative with the IPv6 support in the
Sanitizer.
..
Be a little more conservative with the IPv6 support in the Sanitizer.
This isn't strictly necessary, but it matches the production used in
Parsoid better.
Change-Id: I542b1f71fe9e917fef5718a6df8ebb98735f7fb4
---
M includes/Sanitizer.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/36/234536/1
diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index fbf3234..c02bdc9 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -1809,7 +1809,7 @@
$host = preg_replace( $strip, '', $host );
// IPv6 host names are bracketed with []. Url-decode
these.
- if ( substr_compare( //%5B, $host, 0, 5 ) === 0
preg_match( '!^//%5B(.*?)%5D((:\d+)?)$!', $host, $matches ) ) {
+ if ( substr_compare( //%5B, $host, 0, 5 ) === 0
preg_match( '!^//%5B([0-9A-Fa-f:.]+)%5D((:\d+)?)$!', $host, $matches ) ) {
$host = '//[' . $matches[1] . ']' . $matches[2];
}
--
To view, visit https://gerrit.wikimedia.org/r/234536
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I542b1f71fe9e917fef5718a6df8ebb98735f7fb4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Cscott canan...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] T110674 Update of permissions at Meta-Wiki - change (operations/mediawiki-config)
MarcoAurelio has uploaded a new change for review. https://gerrit.wikimedia.org/r/234544 Change subject: T110674 Update of permissions at Meta-Wiki .. T110674 Update of permissions at Meta-Wiki Removing bureaucrats and checkusers at Meta-Wiki the ability to add and remove the ipblock-exempt permission, as it is redundant, since sysops can add and remove this permission on all wikis now. This was set ages ago when the permission was not universally deployed to the wikis. Bug: T110674 Change-Id: I8772366746244ae1825bec694b3907f3e4710151 --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/44/234544/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index ddc58ba..2098c1a 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -8751,8 +8751,7 @@ 'bureaucrat' = array( 'autoreview', 'transwiki', 'import', 'translationadmin' ), ), '+metawiki' = array( - 'bureaucrat' = array( 'ipblock-exempt', 'centralnoticeadmin', 'flood', 'uploader', 'translationadmin' ), // T48639 - 'checkuser' = array( 'ipblock-exempt' ), + 'bureaucrat' = array( 'centralnoticeadmin', 'flood', 'uploader', 'translationadmin' ), // T48639, T110674 'sysop' = array( 'autopatrolled', 'massmessage-sender' ), // T59611 ), '+mkwiki' = array( @@ -9387,8 +9386,7 @@ 'bureaucrat' = array( 'autoreview', 'transwiki', 'import', 'translationadmin' ), ), '+metawiki' = array( - 'bureaucrat' = array( 'ipblock-exempt', 'flood', 'translationadmin', 'centralnoticeadmin', 'uploader' ), // T39198, T52287 - 'checkuser' = array( 'ipblock-exempt' ), + 'bureaucrat' = array( 'flood', 'translationadmin', 'centralnoticeadmin', 'uploader' ), // T39198, T52287, T110674 'sysop' = array( 'autopatrolled', 'massmessage-sender' ), // T59611 ), '+mkwiki' = array( -- To view, visit https://gerrit.wikimedia.org/r/234544 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8772366746244ae1825bec694b3907f3e4710151 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: MarcoAurelio strig...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] elasticsearch: ferm for 14-17 - change (operations/puppet)
Rush has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234550
Change subject: elasticsearch: ferm for 14-17
..
elasticsearch: ferm for 14-17
Change-Id: I3c9614d5082ce0df240c17e902e707006698cc83
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/50/234550/1
diff --git a/manifests/site.pp b/manifests/site.pp
index f6cd46e..db676a8 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -855,7 +855,7 @@
role elasticsearch::server
-if $::hostname =~ /^elastic10(1[8-9]|2[0-9]|3[0-1])$/ {
+if $::hostname =~ /^elastic10(1[4-9]|2[0-9]|3[0-1])$/ {
include base::firewall
}
}
--
To view, visit https://gerrit.wikimedia.org/r/234550
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c9614d5082ce0df240c17e902e707006698cc83
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush r...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] SpecialRedirectEntity: use HTMLForm::setWrapperLegendMsg() i... - change (mediawiki...Wikibase)
Ricordisamoa has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234549
Change subject: SpecialRedirectEntity: use HTMLForm::setWrapperLegendMsg()
instead of 'section'
..
SpecialRedirectEntity: use HTMLForm::setWrapperLegendMsg() instead of 'section'
Change-Id: I48f8df61c7d7f44a80808dd0b86e06701c0a46a5
---
M repo/includes/specials/SpecialRedirectEntity.php
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/49/234549/1
diff --git a/repo/includes/specials/SpecialRedirectEntity.php
b/repo/includes/specials/SpecialRedirectEntity.php
index cc28730..ae0bb96 100644
--- a/repo/includes/specials/SpecialRedirectEntity.php
+++ b/repo/includes/specials/SpecialRedirectEntity.php
@@ -184,7 +184,6 @@
$formDescriptor['submit'] = array(
'name' = 'wikibase-redirectentity-submit',
- 'section' = 'redirectentity', // special-redirectentity
'default' = $this-msg(
'wikibase-redirectentity-submit' )-text(),
'type' = 'submit',
'id' = 'wb-redirectentity-submit',
@@ -194,6 +193,7 @@
HTMLForm::factory( 'ooui', $formDescriptor,
$this-getContext(), 'special' )
-setId( 'wb-redirectentity-form1' )
-setPreText( $pre )
+ -setWrapperLegendMsg( 'special-redirectentity' )
-suppressDefaultSubmit()
-setSubmitCallback( function () {// no-op
} )-show();
@@ -208,7 +208,6 @@
return array(
'fromid' = array(
'name' = 'fromid',
- 'section' = 'redirectentity', //
special-redirectentity
'default' = $this-getRequest()-getVal(
'fromid' ),
'type' = 'text',
'cssclass' = 'wb-input',
@@ -217,7 +216,6 @@
),
'toid' = array(
'name' = 'toid',
- 'section' = 'redirectentity', //
special-redirectentity
'default' = $this-getRequest()-getVal(
'toid' ),
'type' = 'text',
'cssclass' = 'wb-input',
--
To view, visit https://gerrit.wikimedia.org/r/234549
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I48f8df61c7d7f44a80808dd0b86e06701c0a46a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa ricordisa...@openmailbox.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Release version 0.4.0 - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Release version 0.4.0
..
Release version 0.4.0
Change-Id: I97726e8e6a5148a2f28f094db4db9ca024d9f7c3
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
GWicke: Looks good to me, approved
jenkins-bot: Verified
diff --git a/package.json b/package.json
index d2f7f0a..a12ec4d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
name: parsoid,
description: Mediawiki parser for the VisualEditor.,
- version: 0.3.0-git,
+ version: 0.4.0,
license: GPL-2.0+,
dependencies: {
alea: ~0.0.9,
--
To view, visit https://gerrit.wikimedia.org/r/234537
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I97726e8e6a5148a2f28f094db4db9ca024d9f7c3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott canan...@wikimedia.org
Gerrit-Reviewer: Arlolra abrea...@wikimedia.org
Gerrit-Reviewer: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Subramanya Sastry ssas...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...TorBlock)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove i18n shim
..
Remove i18n shim
Change-Id: I121eef72a030e0d93dc1fd83744ae60c64f6def0
---
D TorBlock.i18n.php
M TorBlock.php
2 files changed, 0 insertions(+), 36 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/TorBlock.i18n.php b/TorBlock.i18n.php
deleted file mode 100644
index 990d4cd..000
--- a/TorBlock.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-?php
-/**
- * This is a backwards-compatibility shim, generated by:
- *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShime8dc6e7a6d9e775f' ) ) {
- function wfJsonI18nShime8dc6e7a6d9e775f( $cache, $code, $cachedData ) {
- $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
- foreach ( $codeSequence as $csCode ) {
- $fileName = dirname( __FILE__ ) . /i18n/$csCode.json;
- if ( is_readable( $fileName ) ) {
- $data = FormatJson::decode( file_get_contents(
$fileName ), true );
- foreach ( array_keys( $data ) as $key ) {
- if ( $key === '' || $key[0] === '@' ) {
- unset( $data[$key] );
- }
- }
- $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
- }
-
- $cachedData['deps'][] = new FileDependency( $fileName );
- }
- return true;
- }
-
- $GLOBALS['wgHooks']['LocalisationCacheRecache'][] =
'wfJsonI18nShime8dc6e7a6d9e775f';
-}
diff --git a/TorBlock.php b/TorBlock.php
index baf46b1..cbf4368 100644
--- a/TorBlock.php
+++ b/TorBlock.php
@@ -40,7 +40,6 @@
);
$wgMessagesDirs['TorBlock'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['TorBlock'] = __DIR__ . /TorBlock.i18n.php;
$wgAutoloadClasses['TorBlockHooks'] = __DIR__ . '/includes/TorBlockHooks.php';
$wgAutoloadClasses['TorExitNodes'] = __DIR__ . '/includes/TorExitNodes.php';
--
To view, visit https://gerrit.wikimedia.org/r/231259
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I121eef72a030e0d93dc1fd83744ae60c64f6def0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TorBlock
Gerrit-Branch: master
Gerrit-Owner: Paladox thomasmulhall...@yahoo.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: Werdna agarr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] refactor wikidata CA cookies workarounds a bit - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: refactor wikidata CA cookies workarounds a bit
..
refactor wikidata CA cookies workarounds a bit
Bug: T109038
Change-Id: I243998e2c03d5e5e98f56293e89753ffab33921d
---
M templates/varnish/text-frontend.inc.vcl.erb
1 file changed, 17 insertions(+), 15 deletions(-)
Approvals:
JanZerebecki: Looks good to me, but someone else must approve
BBlack: Verified; Looks good to me, approved
diff --git a/templates/varnish/text-frontend.inc.vcl.erb
b/templates/varnish/text-frontend.inc.vcl.erb
index 9739e52..20eeb4e 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -198,20 +198,22 @@
call analytics_last_access_deliver;
// This is a temporary hack to work around issues from T109038
- // We should be able to remove this sometime after Sept 16, 2015, as
the old CA cookies should have 30d expiry.
- // For any request Host ending in wikidata.org, if we see a
double-value for the CA token, try to delete the one at .wikidata.org.
- if(req.http.Host ~ (?i)(^|\.)wikidata\.org$ req.http.Cookie ~
centralauth_Token.*centralauth_Token) {
- // The exact format of the cookie-delete string is copied from
examples of normal CA cookie deletes (e.g. for logouts?) seen in traffic logs
- header.append(resp.http.Set-Cookie, centralauth_Token=deleted;
expires=Thu, 01-Jan-1970 00:00:01 GMT; Max-Age=0; path=/; domain=.wikidata.org;
secure; httponly);
- }
- // As above for centralauth_User (see
https://phabricator.wikimedia.org/T109038#1562651)
- if(req.http.Host ~ (?i)(^|\.)wikidata\.org$ req.http.Cookie ~
centralauth_User.*centralauth_User) {
- // The exact format of the cookie-delete string is copied from
examples of normal CA cookie deletes (e.g. for logouts?) seen in traffic logs
- header.append(resp.http.Set-Cookie, centralauth_User=deleted;
expires=Thu, 01-Jan-1970 00:00:01 GMT; Max-Age=0; path=/; domain=.wikidata.org;
secure; httponly);
- }
- // another variant with centralauth_Session (see
https://phabricator.wikimedia.org/T109038#1581615 )
- if(req.http.Host ~ (?i)(^|\.)wikidata\.org$ req.http.Cookie ~
centralauth_Session.*centralauth_Session) {
- // The exact format of the cookie-delete string is copied from
examples of normal CA cookie deletes (e.g. for logouts?) seen in traffic logs
- header.append(resp.http.Set-Cookie,
centralauth_Session=deleted; expires=Thu, 01-Jan-1970 00:00:01 GMT; Max-Age=0;
path=/; domain=.wikidata.org; secure; httponly);
+ // We should be able to remove this sometime after Sept 16, 2015, as
+ // the old CA cookies should have 30d expiry.
+ // For any request Host ending in wikidata.org, if we see a
+ // double-value for the CA token, user, or session, try to delete the
+ // one at .wikidata.org.
+ // The exact format of the cookie-delete strings is copied from
+ // examples of normal CA cookie deletes seen in traffic logs
+ if (req.http.Host ~ (?i)(^|\.)wikidata\.org$) {
+ if (req.http.Cookie ~ centralauth_Token.*centralauth_Token) {
+ header.append(resp.http.Set-Cookie,
centralauth_Token=deleted; expires=Thu, 01-Jan-1970 00:00:01 GMT; Max-Age=0;
path=/; domain=.wikidata.org; secure; httponly);
+ }
+ if(req.http.Cookie ~ centralauth_User.*centralauth_User) {
+ header.append(resp.http.Set-Cookie,
centralauth_User=deleted; expires=Thu, 01-Jan-1970 00:00:01 GMT; Max-Age=0;
path=/; domain=.wikidata.org; secure; httponly);
+ }
+ if(req.http.Cookie ~
centralauth_Session.*centralauth_Session) {
+ header.append(resp.http.Set-Cookie,
centralauth_Session=deleted; expires=Thu, 01-Jan-1970 00:00:01 GMT; Max-Age=0;
path=/; domain=.wikidata.org; secure; httponly);
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/234517
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I243998e2c03d5e5e98f56293e89753ffab33921d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Keep the uploads sorted in the order they were created in in... - change (mediawiki...UploadWizard)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234553
Change subject: Keep the uploads sorted in the order they were created in
initially
..
Keep the uploads sorted in the order they were created in initially
It might be better to track this issue down to the source and find out
the point where the order changes, but the data flow here is scary.
Bug: T92801
Change-Id: I338a0941467fa2d7a5e79760e5f156de48fe07a4
(cherry picked from commit a37bba8dbc2e87b108c7e22c7ef0dabe847f07c5)
---
M resources/controller/uw.controller.Step.js
1 file changed, 12 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/53/234553/1
diff --git a/resources/controller/uw.controller.Step.js
b/resources/controller/uw.controller.Step.js
index 7c24c03..df61591 100644
--- a/resources/controller/uw.controller.Step.js
+++ b/resources/controller/uw.controller.Step.js
@@ -85,6 +85,18 @@
this.uploads = uploads || [];
+ // Keep the uploads sorted in the order they were created in
initially.
+ this.uploads = this.uploads.sort( function ( uploadA, uploadB )
{
+ // Can the uploads be undefined? Code below would imply
they can, no idea how.
+ if ( !uploadA ) {
+ return 1;
+ }
+ if ( !uploadB ) {
+ return -1;
+ }
+ return uploadA.index - uploadB.index;
+ } );
+
$.each( this.uploads, function ( i, upload ) {
if ( upload !== undefined ) {
upload.state = step.stepName;
--
To view, visit https://gerrit.wikimedia.org/r/234553
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I338a0941467fa2d7a5e79760e5f156de48fe07a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: wmf/1.26wmf20
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BREAKING CHANGE] Redesign select file widget to use a clear... - change (oojs/ui)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234556
Change subject: [BREAKING CHANGE] Redesign select file widget to use a clearly
clickable button
..
[BREAKING CHANGE] Redesign select file widget to use a clearly clickable button
The drop target (showDropTarget) is show in addition to the rest of
the widget above it.
Drop target and select button are disabled if the widget is disabled
or file upload is not supported.
setActive and related code removed as it served no purpose.
Change-Id: Ieb66b56534dfe08df3307c7861dbe79daf30f7b4
---
M demos/pages/widgets.js
M i18n/en.json
M i18n/qqq.json
M src/core.js
M src/styles/widgets/SelectFileWidget.less
M src/themes/apex/widgets.less
M src/themes/mediawiki/widgets.less
M src/widgets/SelectFileWidget.js
8 files changed, 212 insertions(+), 168 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/56/234556/1
diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index 9aa7eac..a531d7f 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -114,6 +114,15 @@
return items;
};
+ function UnsupportedSelectFileWidget() {
+ // Parent constructor
+ UnsupportedSelectFileWidget.parent.apply( this, arguments );
+ }
+ OO.inheritClass( UnsupportedSelectFileWidget, OO.ui.SelectFileWidget );
+ UnsupportedSelectFileWidget.static.isSupported = function () {
+ return false;
+ };
+
capsulePopupWidget = new OO.ui.NumberInputWidget( {
isInteger: true
} );
@@ -952,9 +961,35 @@
}
),
new OO.ui.FieldLayout(
- new OO.ui.SelectFileWidget( {
dragDropUI: true } ),
+ new UnsupportedSelectFileWidget(),
{
- label: 'SelectFileWidget (drag
drop UI)\u200E',
+ label: 'SelectFileWidget (no
browser support)\u200E',
+ align: 'top'
+ }
+ ),
+ new OO.ui.FieldLayout(
+ new OO.ui.SelectFileWidget( {
showDropTarget: true } ),
+ {
+ label: 'SelectFileWidget (with
drop target)\u200E',
+ align: 'top'
+ }
+ ),
+ new OO.ui.FieldLayout(
+ new OO.ui.SelectFileWidget( {
+ showDropTarget: true,
+ disabled: true
+ } ),
+ {
+ label: 'SelectFileWidget (with
drop target, disabled)\u200E',
+ align: 'top'
+ }
+ ),
+ new OO.ui.FieldLayout(
+ new UnsupportedSelectFileWidget( {
+ showDropTarget: true
+ } ),
+ {
+ label: 'SelectFileWidget (with
drop target, no browser support)\u200E',
align: 'top'
}
),
diff --git a/i18n/en.json b/i18n/en.json
index db2399f..7cf2eb1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -28,8 +28,9 @@
ooui-dialog-process-dismiss: Dismiss,
ooui-dialog-process-retry: Try again,
ooui-dialog-process-continue: Continue,
+ ooui-selectfile-button-select: Select a file,
ooui-selectfile-not-supported: File selection is not supported,
ooui-selectfile-placeholder: No file is selected,
- ooui-selectfile-dragdrop-placeholder: Drop file here (or click to
browse),
+ ooui-selectfile-dragdrop-placeholder: Drop file here,
ooui-semicolon-separator: ;
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 607229d..cd9c0c2 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -32,8 +32,9 @@
ooui-dialog-process-dismiss: Label for process dialog dismiss error
button, visible when describing errors\n{{Identical|Dismiss}},
ooui-dialog-process-retry: Label for process dialog retry action
button, visible when describing recoverable
[MediaWiki-commits] [Gerrit] Breaking change: Do not autoload anymore with composer - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Breaking change: Do not autoload anymore with composer
..
Breaking change: Do not autoload anymore with composer
Use wfLoadExtension or require_once instead.
Change-Id: I5bb19530ff715717c466d9333b5122eea2612d11
---
M Translate.php
M composer.json
2 files changed, 157 insertions(+), 160 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Translate.php b/Translate.php
index 74c3059..06b206e 100644
--- a/Translate.php
+++ b/Translate.php
@@ -22,7 +22,7 @@
/**
* Extension credits properties.
*/
-$GLOBALS['wgExtensionCredits']['specialpage'][] = array(
+$wgExtensionCredits['specialpage'][] = array(
'path' = __FILE__,
'name' = 'Translate',
'version' = TRANSLATE_VERSION,
@@ -49,179 +49,179 @@
* @cond file_level_code
*/
-$GLOBALS['wgMessagesDirs']['PageTranslation'] = __DIR__ .
/i18n/pagetranslation;
-$GLOBALS['wgMessagesDirs']['Translate'] = __DIR__ . /i18n/core;
-$GLOBALS['wgMessagesDirs']['TranslateGroupDescriptions'] = __DIR__ .
/i18n/groupdescriptions;
-$GLOBALS['wgMessagesDirs']['TranslateSearch'] = __DIR__ . /i18n/search;
-$GLOBALS['wgMessagesDirs']['TranslateSandbox'] = __DIR__ . /i18n/sandbox;
-$GLOBALS['wgMessagesDirs']['TranslateApi'] = __DIR__ . /i18n/api;
-$GLOBALS['wgExtensionMessagesFiles']['TranslateAlias'] =
$dir/Translate.alias.php;
-$GLOBALS['wgExtensionMessagesFiles']['TranslateMagic'] =
$dir/Translate.i18n.magic.php;
+$wgMessagesDirs['PageTranslation'] = __DIR__ . /i18n/pagetranslation;
+$wgMessagesDirs['Translate'] = __DIR__ . /i18n/core;
+$wgMessagesDirs['TranslateGroupDescriptions'] = __DIR__ .
/i18n/groupdescriptions;
+$wgMessagesDirs['TranslateSearch'] = __DIR__ . /i18n/search;
+$wgMessagesDirs['TranslateSandbox'] = __DIR__ . /i18n/sandbox;
+$wgMessagesDirs['TranslateApi'] = __DIR__ . /i18n/api;
+$wgExtensionMessagesFiles['TranslateAlias'] = $dir/Translate.alias.php;
+$wgExtensionMessagesFiles['TranslateMagic'] = $dir/Translate.i18n.magic.php;
// Backwards compatibility:
// If Special:MyLanguage is not in core, load translations of its name
// from the Translate extension's code.
// See https://phabricator.wikimedia.org/T71461
// Can be removed when MW 1.23 is no longer supported
-if ( !isset( $GLOBALS['wgAutoloadLocalClasses']['SpecialMyLanguage'] ) ) {
- $GLOBALS['wgExtensionMessagesFiles']['TranslateMyLanguageAlias'] =
+if ( !isset( $wgAutoloadLocalClasses['SpecialMyLanguage'] ) ) {
+ $wgExtensionMessagesFiles['TranslateMyLanguageAlias'] =
$dir/Translate.MyLanguage.alias.php;
}
// Register initialization code
-$GLOBALS['wgExtensionFunctions'][] = 'TranslateHooks::setupTranslate';
-$GLOBALS['wgHooks']['CanonicalNamespaces'][] =
'TranslateHooks::setupNamespaces';
-$GLOBALS['wgHooks']['UnitTestsList'][] = 'TranslateHooks::setupUnitTests';
-$GLOBALS['wgHooks']['LoadExtensionSchemaUpdates'][] =
'TranslateHooks::schemaUpdates';
-$GLOBALS['wgHooks']['ParserTestTables'][] = 'TranslateHooks::parserTestTables';
-$GLOBALS['wgHooks']['PageContentLanguage'][] =
'TranslateHooks::onPageContentLanguage';
+$wgExtensionFunctions[] = 'TranslateHooks::setupTranslate';
+$wgHooks['CanonicalNamespaces'][] = 'TranslateHooks::setupNamespaces';
+$wgHooks['UnitTestsList'][] = 'TranslateHooks::setupUnitTests';
+$wgHooks['LoadExtensionSchemaUpdates'][] = 'TranslateHooks::schemaUpdates';
+$wgHooks['ParserTestTables'][] = 'TranslateHooks::parserTestTables';
+$wgHooks['PageContentLanguage'][] = 'TranslateHooks::onPageContentLanguage';
// Register special pages into MediaWiki
-$GLOBALS['wgSpecialPages']['Translate'] = 'SpecialTranslate';
-$GLOBALS['wgSpecialPages']['Translations'] = 'SpecialTranslations';
+$wgSpecialPages['Translate'] = 'SpecialTranslate';
+$wgSpecialPages['Translations'] = 'SpecialTranslations';
// Disabled by default
-// $GLOBALS['wgSpecialPages']['Magic'] = 'SpecialMagic';
-$GLOBALS['wgSpecialPages']['TranslationStats'] = 'SpecialTranslationStats';
-$GLOBALS['wgSpecialPages']['LanguageStats'] = 'SpecialLanguageStats';
-$GLOBALS['wgSpecialPages']['MessageGroupStats'] = 'SpecialMessageGroupStats';
-$GLOBALS['wgSpecialPages']['ImportTranslations'] = 'SpecialImportTranslations';
-$GLOBALS['wgSpecialPages']['ManageMessageGroups'] = 'SpecialManageGroups';
-$GLOBALS['wgSpecialPages']['SupportedLanguages'] = 'SpecialSupportedLanguages';
-$GLOBALS['wgSpecialPages']['MyLanguage'] = 'SpecialMyLanguage';
-$GLOBALS['wgSpecialPages']['AggregateGroups'] = 'SpecialAggregateGroups';
-$GLOBALS['wgSpecialPages']['SearchTranslations'] = 'SpecialSearchTranslations';
-$GLOBALS['wgSpecialPages']['ManageTranslatorSandbox'] =
'SpecialManageTranslatorSandbox';
-$GLOBALS['wgSpecialPages']['TranslationStash'] = 'SpecialTranslationStash';
+// $wgSpecialPages['Magic'] = 'SpecialMagic';
+$wgSpecialPages['TranslationStats'] =
[MediaWiki-commits] [Gerrit] nodepool: update apt pinning - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged.
Change subject: nodepool: update apt pinning
..
nodepool: update apt pinning
Our Jessie servers no more included upstream jessie-backports. Update
the pinning to jessie-wikimedia/backports.
Bug: T110656
Change-Id: I61d99be3a735abe7f84dd5f4a9c63e3882839e25
---
M modules/nodepool/manifests/init.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/nodepool/manifests/init.pp
b/modules/nodepool/manifests/init.pp
index d3dc06c..abbfcc3 100644
--- a/modules/nodepool/manifests/init.pp
+++ b/modules/nodepool/manifests/init.pp
@@ -59,12 +59,12 @@
# Nodepool 0.1.0 requires novaclient=2.21.0
# Jessie has 2.18.1 (T104971)
apt::pin { 'python-novaclient':
-pin = 'release a=jessie-backports',
+pin = 'release a=jessie-wikimedia c=backports',
priority = '1001',
before = Package['nodepool'],
}
apt::pin { 'python-openstackclient':
-pin = 'release a=jessie-backports',
+pin = 'release a=jessie-wikimedia c=backports',
priority = '1001',
before = Package['nodepool'],
}
--
To view, visit https://gerrit.wikimedia.org/r/234535
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I61d99be3a735abe7f84dd5f4a9c63e3882839e25
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove periods from page titles - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged. Change subject: Remove periods from page titles .. Remove periods from page titles https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Pt-deletepage-lang-title/en Change-Id: I5aa69127a56ee4fc0fa5e4fe91969efed11b0460 --- M i18n/pagetranslation/en.json 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: KartikMistry: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/pagetranslation/en.json b/i18n/pagetranslation/en.json index 97176f3..106c3d2 100644 --- a/i18n/pagetranslation/en.json +++ b/i18n/pagetranslation/en.json @@ -143,8 +143,8 @@ pt-movepage-logreason: Part of translatable page \$1\., pt-movepage-started: The base page is now moved.\nPlease check the [[Special:Log/pagetranslation|page translation log]] for errors and completion message., pt-locked-page: This page is locked because the translatable page is currently being moved., - pt-deletepage-lang-title: Deleting translation page \$1\., - pt-deletepage-full-title: Deleting translatable page \$1\., + pt-deletepage-lang-title: Deleting translation page \$1\, + pt-deletepage-full-title: Deleting translatable page \$1\, pt-deletepage-invalid-title: The specified page is not valid., pt-deletepage-invalid-text: The specified page is not a translatable page nor a translation page., pt-deletepage-action-check: List pages to be deleted, -- To view, visit https://gerrit.wikimedia.org/r/229564 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5aa69127a56ee4fc0fa5e4fe91969efed11b0460 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set up varnishkafka instance on cache servers to log raw cli... - change (operations/puppet)
Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234543
Change subject: Set up varnishkafka instance on cache servers to log raw client
side events to kafka
..
Set up varnishkafka instance on cache servers to log raw client side events to
kafka
This will soon fully deprecate the UDP based varnishncsa instance, allow us
to turn off the eventlogging client side UDP - ZMQ forwarder.
Bug: T106255
Change-Id: I470e37575fae87cd85665af88c7212229e68b16b
---
M manifests/role/eventlogging.pp
M modules/role/manifests/cache/kafka/eventlogging.pp
M modules/role/manifests/cache/mobile.pp
M modules/role/manifests/cache/text.pp
4 files changed, 16 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/43/234543/1
diff --git a/manifests/role/eventlogging.pp b/manifests/role/eventlogging.pp
index 213f0bc..dd48997 100644
--- a/manifests/role/eventlogging.pp
+++ b/manifests/role/eventlogging.pp
@@ -269,10 +269,10 @@
# This will be replaced by configuring varnishkafka on cache servers to
send
# events directly to kafka topic 'eventlogging-client-side'.
-eventlogging::service::forwarder { 'client-side-raw':
-input =
tcp://${forwarder_host}:8422?identity=server-side-raw-kafka,
-outputs = [${kafka_base_uri}?topic=eventlogging-client-side],
-}
+# eventlogging::service::forwarder { 'client-side-raw':
+# input =
tcp://${forwarder_host}:8422?identity=server-side-raw-kafka,
+# outputs = [${kafka_base_uri}?topic=eventlogging-client-side],
+# }
}
diff --git a/modules/role/manifests/cache/kafka/eventlogging.pp
b/modules/role/manifests/cache/kafka/eventlogging.pp
index 7959365..c85fd2e 100644
--- a/modules/role/manifests/cache/kafka/eventlogging.pp
+++ b/modules/role/manifests/cache/kafka/eventlogging.pp
@@ -11,7 +11,7 @@
topic = 'eventlogging-client-side',
varnish_name = $varnish_name,
varnish_svc_name = $varnish_svc_name,
-varnish_opts = { 'm' = 'RxURL:^/beacon/event(\.gif)?\?.' },
-topic_request_required_acks = '-1',
+varnish_opts = { 'm' = 'RxURL:^/(beacon/)?event(\.gif)?\?' },
+topic_request_required_acks = '1',
}
}
diff --git a/modules/role/manifests/cache/mobile.pp
b/modules/role/manifests/cache/mobile.pp
index fd088c8..b67ee30 100644
--- a/modules/role/manifests/cache/mobile.pp
+++ b/modules/role/manifests/cache/mobile.pp
@@ -141,9 +141,14 @@
varnish_name = 'frontend',
}
+# role::cache::logging::eventlistener will soon be fully
+# replaced by role::cache::kafka::eventlogging.
class { '::role::cache::logging::eventlistener':
instance_name = 'frontend',
}
+class { '::role::cache::kafka::eventlogging':
+varnish_name = 'frontend',
+}
# ToDo: Remove production conditional once this works
# is verified to work in labs.
diff --git a/modules/role/manifests/cache/text.pp
b/modules/role/manifests/cache/text.pp
index cb62b95..d3807f3 100644
--- a/modules/role/manifests/cache/text.pp
+++ b/modules/role/manifests/cache/text.pp
@@ -172,9 +172,14 @@
varnish_name = 'frontend',
}
+# role::cache::logging::eventlistener will soon be fully
+# replaced by role::cache::kafka::eventlogging.
class { '::role::cache::logging::eventlistener':
instance_name = 'frontend',
}
+class { '::role::cache::kafka::eventlogging':
+varnish_name = 'frontend',
+}
# ToDo: Remove production conditional once this works
# is verified to work in labs.
--
To view, visit https://gerrit.wikimedia.org/r/234543
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I470e37575fae87cd85665af88c7212229e68b16b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] API: Add ApiResult::META_KVP_MERGE - change (mediawiki/core)
Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234548
Change subject: API: Add ApiResult::META_KVP_MERGE
..
API: Add ApiResult::META_KVP_MERGE
This allows for merging the KVP key into the value for the alternative
output format. Specifically,
{ key: { foo: bar } }
can now be turned into
[{ name: key, foo: bar }]
instead of
[{ name: key, value: { foo: bar } }]
Change-Id: Ie1f9235893dbbcd2948c46e0356360b5635a3ddd
---
M RELEASE-NOTES-1.26
M includes/api/ApiResult.php
M tests/phpunit/includes/api/ApiResultTest.php
3 files changed, 93 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/48/234548/1
diff --git a/RELEASE-NOTES-1.26 b/RELEASE-NOTES-1.26
index 14d6c58..5b85bbc 100644
--- a/RELEASE-NOTES-1.26
+++ b/RELEASE-NOTES-1.26
@@ -99,6 +99,8 @@
information about the relevant block.
=== Action API internal changes in 1.26 ===
+* New metadata item ApiResult::META_KVP_MERGE to allow for merging the KVP key
+ into the value when the value is an assoc.
=== Languages updated in 1.26 ===
diff --git a/includes/api/ApiResult.php b/includes/api/ApiResult.php
index f0c7430..2675185 100644
--- a/includes/api/ApiResult.php
+++ b/includes/api/ApiResult.php
@@ -108,11 +108,23 @@
const META_TYPE = '_type';
/**
-* Key (rather than name or other default) for when META_TYPE is
'kvp' or
-* 'BCkvp'. Value is string.
+* Key for the metatata item whose value specifies the name used for the
+* kvp key in the alternative output format with META_TYPE 'kvp' or
+* 'BCkvp', i.e. the name in containeritem
name=keyvalue/item/container.
+* Value is string.
* @since 1.25
*/
const META_KVP_KEY_NAME = '_kvpkeyname';
+
+ /**
+* Key for the metadata item that indicates that the KVP key should be
+* added into an assoc value, i.e. {key:{val1:a,val2:b}}
+* transforms to {name:key,val1:a,val2:b} rather than
+* {name:key,value:{val1:a,val2:b}}.
+* Value is boolean.
+* @since 1.26
+*/
+ const META_KVP_MERGE = '_kvpmerge';
/**
* Key for the 'BC bools' metadata item. Value is string[].
@@ -941,19 +953,43 @@
: $transformTypes['ArmorKVP'];
$valKey = isset( $transforms['BC'] ) ?
'*' : 'value';
$assocAsObject = !empty(
$transformTypes['AssocAsObject'] );
+ $merge = !empty(
$metadata[self::META_KVP_MERGE] );
$ret = array();
foreach ( $data as $k = $v ) {
- $item = array(
- $key = $k,
- $valKey = $v,
- );
- if ( $strip === 'none' ) {
- $item += array(
-
self::META_PRESERVE_KEYS = array( $key ),
-
self::META_CONTENT = $valKey,
- self::META_TYPE
= 'assoc',
+ if ( $merge ( is_array( $v )
|| is_object( $v ) ) ) {
+ $vArr = (array)$v;
+ if ( isset(
$vArr[self::META_TYPE] ) ) {
+ $mergeType =
$vArr[self::META_TYPE];
+ } elseif ( is_object(
$v ) ) {
+ $mergeType =
'assoc';
+ } else {
+ $keys =
array_keys( $vArr );
+ sort( $keys,
SORT_NUMERIC );
+ $mergeType = (
$keys === array_keys( $keys ) ) ? 'array' : 'assoc';
+ }
+ } else {
+ $mergeType = 'n/a';
+ }
+ if ( $mergeType === 'assoc' ) {
+ $item = $vArr + array(
+ $key = $k,
[MediaWiki-commits] [Gerrit] Don't alert on stopped eventlogging jobs on analytics1010 - change (operations/puppet)
Ottomata has submitted this change and it was merged.
Change subject: Don't alert on stopped eventlogging jobs on analytics1010
..
Don't alert on stopped eventlogging jobs on analytics1010
Change-Id: I0d325800554eb23bcc18d1d4e6300eff46200f4d
---
M manifests/role/eventlogging.pp
M modules/eventlogging/manifests/monitoring/jobs.pp
2 files changed, 15 insertions(+), 4 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/role/eventlogging.pp b/manifests/role/eventlogging.pp
index 213f0bc..6eeaac6 100644
--- a/manifests/role/eventlogging.pp
+++ b/manifests/role/eventlogging.pp
@@ -62,8 +62,6 @@
class { '::eventlogging': }
-# make sure any defined eventlogging services are running
-class { '::eventlogging::monitoring::jobs': }
if $::standard::has_ganglia {
class { '::eventlogging::monitoring::ganglia': }
@@ -71,6 +69,7 @@
# This check was written for eventlog1001, so only include it there.,
if $::hostname == 'eventlog1001' {
+
# Alert when / gets low. (eventlog1001 has a 9.1G /)
nrpe::monitor_service { 'eventlogging_root_disk_space':
description = 'Eventlogging / disk space',
@@ -88,6 +87,18 @@
contact_group = 'analytics',
}
}
+
+
+# analytics1010 is temporarily being used as a staging perf test
+# host for the EventLogging on Kafka project. Disable job alerts there.
+$monitor_jobs_ensure = $::hostname ? {
+'analytics1010' = 'absent',
+default = 'present',
+}
+# make sure any defined eventlogging services are running
+class { '::eventlogging::monitoring::jobs':
+ensure = $monitor_jobs_ensure,
+}
}
diff --git a/modules/eventlogging/manifests/monitoring/jobs.pp
b/modules/eventlogging/manifests/monitoring/jobs.pp
index 96032da..47364f9 100644
--- a/modules/eventlogging/manifests/monitoring/jobs.pp
+++ b/modules/eventlogging/manifests/monitoring/jobs.pp
@@ -3,14 +3,14 @@
# Installs an icinga check to make sure all defined
# eventlogging services are running.
#
-class eventlogging::monitoring::jobs {
+class eventlogging::monitoring::jobs($ensure = 'present') {
file { '/usr/lib/nagios/plugins/check_eventlogging_jobs':
source = 'puppet:///modules/eventlogging/check_eventlogging_jobs',
mode = '0755',
}
nrpe::monitor_service { 'eventlogging-jobs':
-ensure= 'present',
+ensure= $ensure,
description = 'Check status of defined EventLogging jobs',
nrpe_command = '/usr/lib/nagios/plugins/check_eventlogging_jobs',
require =
File['/usr/lib/nagios/plugins/check_eventlogging_jobs'],
--
To view, visit https://gerrit.wikimedia.org/r/234546
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0d325800554eb23bcc18d1d4e6300eff46200f4d
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Milimetric dandree...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump version after release. - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Bump version after release.
..
Bump version after release.
Change-Id: Ic82211b7d0cf669d637e9c25ff672af9026c13f7
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Cscott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/package.json b/package.json
index a12ec4d..002c9e7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
name: parsoid,
description: Mediawiki parser for the VisualEditor.,
- version: 0.4.0,
+ version: 0.4.0-git,
license: GPL-2.0+,
dependencies: {
alea: ~0.0.9,
--
To view, visit https://gerrit.wikimedia.org/r/234538
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic82211b7d0cf669d637e9c25ff672af9026c13f7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott canan...@wikimedia.org
Gerrit-Reviewer: Cscott canan...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump src to b52ac7fa for release of 0.4.0 - change (mediawiki...deploy)
jenkins-bot has submitted this change and it was merged. Change subject: Bump src to b52ac7fa for release of 0.4.0 .. Bump src to b52ac7fa for release of 0.4.0 Change-Id: Ib998430f61c1ece4fc57f08ad36bce852c0d9305 --- M src 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Cscott: Looks good to me, approved jenkins-bot: Verified diff --git a/src b/src index 44d657d..b52ac7f 16 --- a/src +++ b/src -Subproject commit 44d657de98f38460a4bc4932c336cad20a3ed340 +Subproject commit b52ac7fa92ac60921ce3c20718643ba143bcac95 -- To view, visit https://gerrit.wikimedia.org/r/234552 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib998430f61c1ece4fc57f08ad36bce852c0d9305 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid/deploy Gerrit-Branch: master Gerrit-Owner: Cscott canan...@wikimedia.org Gerrit-Reviewer: Arlolra abrea...@wikimedia.org Gerrit-Reviewer: Cscott canan...@wikimedia.org Gerrit-Reviewer: GWicke gwi...@wikimedia.org Gerrit-Reviewer: Subramanya Sastry ssas...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Release version 0.4.0 - change (mediawiki...parsoid)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234537
Change subject: Release version 0.4.0
..
Release version 0.4.0
Change-Id: I97726e8e6a5148a2f28f094db4db9ca024d9f7c3
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/37/234537/1
diff --git a/package.json b/package.json
index d2f7f0a..a12ec4d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
name: parsoid,
description: Mediawiki parser for the VisualEditor.,
- version: 0.3.0-git,
+ version: 0.4.0,
license: GPL-2.0+,
dependencies: {
alea: ~0.0.9,
--
To view, visit https://gerrit.wikimedia.org/r/234537
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I97726e8e6a5148a2f28f094db4db9ca024d9f7c3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott canan...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump version after release. - change (mediawiki...parsoid)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234538
Change subject: Bump version after release.
..
Bump version after release.
Change-Id: Ic82211b7d0cf669d637e9c25ff672af9026c13f7
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/38/234538/1
diff --git a/package.json b/package.json
index a12ec4d..002c9e7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
name: parsoid,
description: Mediawiki parser for the VisualEditor.,
- version: 0.4.0,
+ version: 0.4.0-git,
license: GPL-2.0+,
dependencies: {
alea: ~0.0.9,
--
To view, visit https://gerrit.wikimedia.org/r/234538
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic82211b7d0cf669d637e9c25ff672af9026c13f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott canan...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Turn off batching to get baseline perf numbers in rt testing - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged. Change subject: Turn off batching to get baseline perf numbers in rt testing .. Turn off batching to get baseline perf numbers in rt testing Change-Id: I8a3bc9f40d6cad192b11d12663a1dff981e508ee --- M tests/rttest.localsettings.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Subramanya Sastry: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/rttest.localsettings.js b/tests/rttest.localsettings.js index bc7f248..3714da1 100644 --- a/tests/rttest.localsettings.js +++ b/tests/rttest.localsettings.js @@ -18,7 +18,7 @@ } // Turn on the batching API - parsoidConfig.useBatchAPI = true; + // parsoidConfig.useBatchAPI = true; // We pre-define wikipedias as 'enwiki', 'dewiki' etc. Similarly // for other projects: 'enwiktionary', 'enwikiquote', 'enwikibooks', -- To view, visit https://gerrit.wikimedia.org/r/234547 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8a3bc9f40d6cad192b11d12663a1dff981e508ee Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org Gerrit-Reviewer: Subramanya Sastry ssas...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Amazon code cleanup - change (mediawiki...DonationInterface)
jenkins-bot has submitted this change and it was merged.
Change subject: Amazon code cleanup
..
Amazon code cleanup
Delete more unused code, add a bunch of comments.
Override generateOrderID instead of altering oid in staging.
Change-Id: Ia82e8e5e2f36d23d67afe886bcd97b1b2599afc9
---
M amazon_gateway/amazon.adapter.php
M amazon_gateway/amazon.js
M tests/Adapter/Amazon/AmazonTest.php
3 files changed, 46 insertions(+), 107 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/amazon_gateway/amazon.adapter.php
b/amazon_gateway/amazon.adapter.php
index adceb04..bc4d269 100644
--- a/amazon_gateway/amazon.adapter.php
+++ b/amazon_gateway/amazon.adapter.php
@@ -21,7 +21,9 @@
*/
/**
- * @see
https://amazonpayments.s3.amazonaws.com/FPS_ASP_Guides/ASP_Advanced_Users_Guide.pdf
+ * Uses Login and Pay with Amazon widgets and the associated SDK to charge
donors
+ * See https://payments.amazon.com/documentation
+ * and https://github.com/amzn/login-and-pay-with-amazon-sdk-php
*/
class AmazonAdapter extends GatewayAdapter {
const GATEWAY_NAME = 'Amazon';
@@ -65,25 +67,12 @@
}
function defineVarMap() {
- $this-var_map = array(
- amount = amount,
- transactionAmount = amount,
- transactionId = gateway_txn_id,
- status = gateway_status,
- buyerEmail = email,
- transactionDate = date_collect,
- buyerName = fname, // This is dealt with in
addDataFromURI()
- errorMessage = error_message,
- paymentMethod = payment_submethod,
- referenceId = contribution_tracking_id,
- );
+ // TODO: maybe use this for mapping gatway data to API call
parameters
+ $this-var_map = array();
}
function defineAccountInfo() {
- //XXX since this class actually accesses two different
endpoints,
- // the usefulness of this function is uncertain. In other
words,
- // account info is transaction-specific. We use account_config
- // instead
+ // We use account_config instead
$this-accountInfo = array();
}
function defineReturnValueMap() {}
@@ -98,13 +87,7 @@
function setGatewayDefaults() {}
public function defineErrorMap() {
-
- $this-error_map = array(
- // Internal messages
- 'internal-' = 'donate_interface-processing-error',
// Failed failed pre-process checks.
- 'internal-0001' = 'donate_interface-processing-error',
// Transaction could not be processed due to an internal error.
- 'internal-0002' = 'donate_interface-processing-error',
// Communication failure
- );
+ $this-error_map = array();
}
function defineTransactions() {
@@ -124,13 +107,12 @@
);
}
- protected function buildRequestParams() {
- $queryparams = parent::buildRequestParams();
- ksort( $queryparams );
-
- return $queryparams;
- }
-
+ /**
+* Note that the Amazon adapter is somewhat unique in that it uses a
third
+* party SDK to make all processor API calls. Since we're never calling
+* do_transaction and friends, we synthesize a
PaymentTransactionResponse
+* to hold any errors returned from the SDK.
+*/
public function doPayment() {
$resultData = new PaymentTransactionResponse();
if ( $this-session_getData( 'sequence' ) ) {
@@ -170,6 +152,14 @@
) );
}
+ /**
+* Amazon's widget has made calls to create an order reference object
and
+* has provided us the ID. We make one API call to set amount,
currency,
+* and our note and local reference ID. A second call confirms that the
+* details are valid and moves it out of draft state. Once it is out of
+* draft state, we can retrieve the donor's name and email address with
a
+* third API call.
+*/
protected function confirmOrderReference() {
$client = $this-getPwaClient();
@@ -207,6 +197,14 @@
) );
}
+ /**
+* Once the order reference is finalized, we can authorize a payment
against
+* it and capture the funds. We combine both steps in a single
authorize
+* call. If the authorization is successful, we can check on the
capture
+* status and close the order reference. TODO: determine if capture
status
+* check is really needed. According to our tech contact, Amazon
[MediaWiki-commits] [Gerrit] Ignore warnings when building APIError - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Ignore warnings when building APIError
..
Ignore warnings when building APIError
Bug: T109945
Change-Id: I2bc55a7dab67e56292eda4c2c8bc20b0a60d7a9b
---
M pywikibot/data/api.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
XZise: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py
index 11987bb..c85f851 100644
--- a/pywikibot/data/api.py
+++ b/pywikibot/data/api.py
@@ -2019,7 +2019,7 @@
error = result['error'].copy()
for key in result:
-if key == 'error':
+if key in ('error', 'warnings'):
continue
assert key not in error
assert isinstance(result[key], basestring), \
--
To view, visit https://gerrit.wikimedia.org/r/234465
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2bc55a7dab67e56292eda4c2c8bc20b0a60d7a9b
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg jay...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Ricordisamoa ricordisa...@openmailbox.org
Gerrit-Reviewer: XZise commodorefabia...@gmx.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated RuboCop to the latest released version - change (mediawiki...WikiLove)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/234533 Change subject: Updated RuboCop to the latest released version .. Updated RuboCop to the latest released version Regenerated `.rubocop_todo.yml` file with the new version of RuboCop. Updated `.rubocop.yml` file with configuration recommended at Ruby coding conventions page: https://www.mediawiki.org/wiki/Manual:Coding_conventions/Ruby#RuboCop Style/StringLiterals is commented out until it is fixed. Change-Id: I358cc259438a839af09eff5b7da289231687c9c3 --- M .rubocop.yml M .rubocop_todo.yml M Gemfile M Gemfile.lock 4 files changed, 37 insertions(+), 30 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiLove refs/changes/33/234533/1 diff --git a/.rubocop.yml b/.rubocop.yml index cc32da4..d2ca1a1 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1 +1,23 @@ inherit_from: .rubocop_todo.yml + +AllCops: + StyleGuideCopsOnly: true + +Metrics/LineLength: + Max: 100 + +Metrics/MethodLength: + Enabled: false + +Style/Alias: + Enabled: false + +Style/SignalException: + Enabled: false + +# Uncomment when the time comes +# Style/StringLiterals: +# EnforcedStyle: single_quotes + +Style/TrivialAccessors: + ExactNameMatch: true diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index ec49220..22ffbe2 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,25 +1,12 @@ -# This configuration was generated by `rubocop --auto-gen-config` -# on 2014-10-21 17:39:07 +0200 using RuboCop version 0.26.1. +# This configuration was generated by +# `rubocop --auto-gen-config` +# on 2015-08-28 16:11:01 +0200 using RuboCop version 0.33.0. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new # versions of RuboCop, may require this file to be generated again. -# Offense count: 5 -# Configuration parameters: AllowURI, URISchemes. -Metrics/LineLength: - Max: 98 - -# Offense count: 1 -Style/Documentation: - Enabled: false - -# Offense count: 2 -# Cop supports --auto-correct. -Style/LeadingCommentSpace: - Enabled: false - -# Offense count: 18 +# Offense count: 22 # Cop supports --auto-correct. # Configuration parameters: SupportedStyles. Style/StringLiterals: diff --git a/Gemfile b/Gemfile index 6209ad7..ee5cf1c 100755 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ source https://rubygems.org; gem mediawiki_selenium, ~ 1.5.0 -gem rubocop, require: false +gem rubocop, 0.33.0, require: false diff --git a/Gemfile.lock b/Gemfile.lock index ca03a28..c6a55ab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ GEM remote: https://rubygems.org/ specs: -ast (2.0.0) -astrolabe (1.3.0) - parser (= 2.2.0.pre.3, 3.0) +ast (2.1.0) +astrolabe (1.3.1) + parser (~ 2.2) builder (3.2.2) childprocess (0.5.6) ffi (~ 1.0, = 1.0.11) @@ -58,10 +58,9 @@ watir-webdriver (= 0.6.11) page_navigation (0.9) data_magic (= 0.14) -parser (2.2.0.pre.4) +parser (2.2.2.6) ast (= 1.1, 3.0) - slop (~ 3.4, = 3.4.5) -powerpack (0.0.9) +powerpack (0.1.1) rainbow (2.0.0) rest-client (1.8.0) http-cookie (= 1.0.2, 2.0) @@ -69,20 +68,19 @@ netrc (~ 0.7) rspec-expectations (2.99.2) diff-lcs (= 1.1.3, 2.0) -rubocop (0.26.1) +rubocop (0.33.0) astrolabe (~ 1.3) - parser (= 2.2.0.pre.4, 3.0) - powerpack (~ 0.0.6) + parser (= 2.2.2.5, 3.0) + powerpack (~ 0.1) rainbow (= 1.99.1, 3.0) ruby-progressbar (~ 1.4) -ruby-progressbar (1.6.0) +ruby-progressbar (1.7.5) rubyzip (1.1.7) selenium-webdriver (2.47.1) childprocess (~ 0.5) multi_json (~ 1.0) rubyzip (~ 1.0) websocket (~ 1.0) -slop (3.6.0) syntax (1.2.0) thor (0.19.1) unf (0.1.4) @@ -98,4 +96,4 @@ DEPENDENCIES mediawiki_selenium (~ 1.5.0) - rubocop + rubocop (= 0.33.0) -- To view, visit https://gerrit.wikimedia.org/r/234533 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I358cc259438a839af09eff5b7da289231687c9c3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikiLove Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Keep the uploads sorted in the order they were created in in... - change (mediawiki...UploadWizard)
jenkins-bot has submitted this change and it was merged.
Change subject: Keep the uploads sorted in the order they were created in
initially
..
Keep the uploads sorted in the order they were created in initially
It might be better to track this issue down to the source and find out
the point where the order changes, but the data flow here is scary.
Bug: T92801
Change-Id: I338a0941467fa2d7a5e79760e5f156de48fe07a4
---
M resources/controller/uw.controller.Step.js
1 file changed, 12 insertions(+), 0 deletions(-)
Approvals:
MarkTraceur: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/controller/uw.controller.Step.js
b/resources/controller/uw.controller.Step.js
index 7c24c03..df61591 100644
--- a/resources/controller/uw.controller.Step.js
+++ b/resources/controller/uw.controller.Step.js
@@ -85,6 +85,18 @@
this.uploads = uploads || [];
+ // Keep the uploads sorted in the order they were created in
initially.
+ this.uploads = this.uploads.sort( function ( uploadA, uploadB )
{
+ // Can the uploads be undefined? Code below would imply
they can, no idea how.
+ if ( !uploadA ) {
+ return 1;
+ }
+ if ( !uploadB ) {
+ return -1;
+ }
+ return uploadA.index - uploadB.index;
+ } );
+
$.each( this.uploads, function ( i, upload ) {
if ( upload !== undefined ) {
upload.state = step.stepName;
--
To view, visit https://gerrit.wikimedia.org/r/234530
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I338a0941467fa2d7a5e79760e5f156de48fe07a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] admin: let contint-admins run puppet - change (operations/puppet)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/234539 Change subject: admin: let contint-admins run puppet .. admin: let contint-admins run puppet When a patch is merged in Gerrit and on the puppetmaster, it is convenient for contint admins to run puppet since we most probably are already logged on the machine. By giving us the ability to run /usr/local/sbin/puppet-run ops would not need to head to the server to force run puppet. The script stdout/stderr is sent to /var/log/puppet.log which is only readable by root. So even if puppet apply some sensitive information, the contint admins will not see them. Grant a sudo rule to contint-admins to let us run /usr/local/sbin/puppet-run Change-Id: I54aefea6796934f97fbca39ac06f77a98efb65a2 --- M modules/admin/data/data.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/39/234539/1 diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index f13a8c8..950167e 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -137,6 +137,7 @@ 'ALL = (zuul) NOPASSWD: ALL', 'ALL = NOPASSWD: /etc/init.d/jenkins', 'ALL = NOPASSWD: /etc/init.d/postgresql-8.4', + 'ALL = NOPASSWD: /usr/local/sbin/puppet-run', 'ALL = (postgres) NOPASSWD: /usr/bin/psql'] contint-roots: gid: 720 -- To view, visit https://gerrit.wikimedia.org/r/234539 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I54aefea6796934f97fbca39ac06f77a98efb65a2 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix lang and dir assignment in translation helpers - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix lang and dir assignment in translation helpers
..
Fix lang and dir assignment in translation helpers
The translation object is not actually available
in all the helpers - it is only good for suggestions
from assistant languages.
Where relevant, get the target language from
the data object of tux-messagelist.
Follow-up to
I5e8ed02c00514daf390f79617c689070d7475af8
Change-Id: Ib7377e8f270779041f1ea9322951c367023908c3
---
M resources/js/ext.translate.editor.helpers.js
1 file changed, 31 insertions(+), 27 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.translate.editor.helpers.js
b/resources/js/ext.translate.editor.helpers.js
index ebb94b2..ce350bb 100644
--- a/resources/js/ext.translate.editor.helpers.js
+++ b/resources/js/ext.translate.editor.helpers.js
@@ -97,6 +97,7 @@
$messageDescViewer,
$messageDoc,
readMore,
+ langAttr,
$readMore = null;
if ( !mw.config.get(
'wgTranslateDocumentationLanguageCode' ) ) {
@@ -120,24 +121,23 @@
// lang and dir attributes.
// The message documentation is assumed to be
written
// in the content language of the wiki.
+ langAttr = {
+ lang: documentation.language,
+ dir: documentationDir
+ };
+
// Possible classes:
// * mw-content-ltr
// * mw-content-rtl
// (The direction classes are needed, because
the documentation
// is likely to be MediaWiki-formatted text.)
$messageDoc
- .attr( {
- lang: documentation.language,
- dir: documentationDir
- } )
+ .attr( langAttr )
.addClass( 'mw-content-' +
documentationDir )
.html( documentation.html );
this.$editor.find(
'.tux-textarea-documentation' )
- .attr( {
- lang: documentation.language,
- dir: documentationDir
- } )
+ .attr( langAttr )
.val( documentation.value );
$descEditLink.text( mw.msg(
'tux-editor-edit-desc' ) );
@@ -212,28 +212,24 @@
$translationTextarea = this.$editor.find(
'.tux-textarea-translation' );
$.each( translations, function ( index ) {
- var $otherLanguage,
- translationDir,
+ var $otherLanguage, langAttr,
translation = translations[index];
- translationDir = $.uls.data.getDir(
translation.language );
+ langAttr = {
+ lang: translation.language,
+ dir: $.uls.data.getDir(
translation.language )
+ };
$otherLanguage = $( 'div' )
.addClass( 'row in-other-language' )
.append(
$( 'div' )
.addClass( 'nine
columns suggestiontext' )
- .attr( {
- lang:
translation.language,
- dir:
translationDir
- } )
+ .attr( langAttr )
.text(
translation.value ),
$( 'div' )
.addClass( 'three
columns language text-right' )
- .attr( {
-
[MediaWiki-commits] [Gerrit] (WIP) admin: support members aliasing (WIP) - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234554
Change subject: (WIP) admin: support members aliasing (WIP)
..
(WIP) admin: support members aliasing (WIP)
Change-Id: I07c3ab77a5cb981691bca4d3ae452cf3c0773cab
---
M modules/admin/data/data.yaml
M modules/admin/data/data_admin.py
2 files changed, 20 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/54/234554/1
diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 950167e..d21da45 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -1,3 +1,7 @@
+aliases:
+releng: releng
+[demon, dduvall, hashar, thcipriani, twentyafterfour, zfilipin]
+
groups:
absent:
description: meta group for absented users
@@ -36,8 +40,7 @@
gid: 704
description: assist in managing gerrit server
# qchris is RT 6720
-# Rest is the Release Engineering team
-members: [qchris, dduvall, hashar, thcipriani, twentyafterfour, zfilipin]
+members: [*releng, qchris]
deployment:
gid: 705
description: replaces 'mortals' for software deployment
@@ -127,9 +130,7 @@
contint-admins:
gid: 719
description: users with some sudo permissions on jenkins and nodepool hosts
-members: [bd808, cscott, dduvall, demon, krinkle, reedy, marktraceur,
- twentyafterfour, zfilipin, thcipriani, legoktm, jzerebecki,
- hashar]
+members: [*releng, bd808, cscott, krinkle, reedy, marktraceur, legoktm,
jzerebecki]
privileges: ['ALL = (jenkins) NOPASSWD: ALL',
'ALL = (jenkins-slave) NOPASSWD: ALL',
'ALL = (gerritslave) NOPASSWD: ALL',
diff --git a/modules/admin/data/data_admin.py b/modules/admin/data/data_admin.py
index 551e092..1547ea1 100644
--- a/modules/admin/data/data_admin.py
+++ b/modules/admin/data/data_admin.py
@@ -13,11 +13,25 @@
return dict(collections.OrderedDict(sorted(dictionary.items(
+def flatten_members(members):
+res = []
+for m in members:
+if isinstance(m, (list, tuple)):
+res.extend(flatten_members(m))
+else:
+res.append(m)
+# Make them uniq
+return list(collections.OrderedDict.fromkeys(res))
+
+
def main():
data = open('data.yaml', 'r')
admins = yaml.safe_load(data)
+for group in admins['groups'].itervalues():
+group['members'] = flatten_members(group['members'])
+
if 'sort' in sys.argv:
print yaml.dump({'groups': dict_sort(admins['groups'])})
print yaml.dump({'users': dict_sort(admins['users'])})
--
To view, visit https://gerrit.wikimedia.org/r/234554
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I07c3ab77a5cb981691bca4d3ae452cf3c0773cab
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Convert some fields to local variables. - change (apps...wikipedia)
Deskana has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234712
Change subject: Convert some fields to local variables.
..
Convert some fields to local variables.
This patch converts some fields that are only used in a single method to
local variables, to optimise performance and maintain code tidiness.
Change-Id: Ia38f84ecdc87c66a3924b06b43d19e31f7131691
---
M app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
M app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
M app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java
M app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
4 files changed, 3 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/12/234712/1
diff --git a/app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
b/app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
index e3c2b82..c181788 100644
--- a/app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
+++ b/app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
@@ -12,8 +12,6 @@
private static final int PROD_LINK_PREVIEW_VERSION = 3;
private final int version;
-private final PageTitle title;
-
public LinkPreviewFunnel(WikipediaApp app, PageTitle title) {
super(app, SCHEMA_NAME, REV_ID, app.isProdRelease() ?
Funnel.SAMPLE_LOG_100 : Funnel.SAMPLE_LOG_ALL);
this.title = title;
diff --git
a/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
b/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
index a4e71aa..2cc2af6 100644
---
a/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
+++
b/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
@@ -61,7 +61,6 @@
private View bottomContentContainer;
private TextView pageLastUpdatedText;
private TextView pageLicenseText;
-private TextView pageExternalLink;
private View readMoreContainer;
private ListView readMoreList;
@@ -88,7 +87,7 @@
readMoreContainer =
bottomContentContainer.findViewById(R.id.read_more_container);
readMoreList =
(ListView)bottomContentContainer.findViewById(R.id.read_more_list);
-pageExternalLink = (TextView)
bottomContentContainer.findViewById(R.id.page_external_link);
+TextView pageExternalLink = (TextView)
bottomContentContainer.findViewById(R.id.page_external_link);
pageExternalLink.setPaintFlags(pageExternalLink.getPaintFlags() |
Paint.UNDERLINE_TEXT_FLAG);
pageExternalLink.setOnClickListener(new View.OnClickListener() {
@Override
diff --git
a/app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java
b/app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java
index babd012..8d5bbc8 100644
---
a/app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java
+++
b/app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java
@@ -50,7 +50,6 @@
*/
public abstract class SwipeableBottomDialog extends DialogFragment {
private final ListView dialogViews = new ArrayList();
-private ViewGroup rootView;
private ListView dialogListView;
private int dialogPeekHeight;
@@ -76,7 +75,7 @@
int displayWidth = getDialogWidth();
int displayHeight =
inflater.getContext().getResources().getDisplayMetrics().heightPixels;
-rootView = (ViewGroup) inflater.inflate(R.layout.dialog_bottom_swipe,
container);
+ViewGroup rootView = (ViewGroup)
inflater.inflate(R.layout.dialog_bottom_swipe, container);
dialogViews.add(makeSpaceView(displayWidth, 1));
dialogViews.add(makeSpaceView(displayWidth, dialogPeekHeight));
diff --git a/app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
b/app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
index e19cf49..4d4d897 100644
--- a/app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
+++ b/app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
@@ -44,7 +44,6 @@
private EditText searchEditText;
private SearchFunnel funnel;
private TextView langButton;
-private FrameLayout langButtonContainer;
public SearchFunnel getFunnel() {
return funnel;
@@ -287,7 +286,7 @@
LinearLayout enabledSearchBar = (LinearLayout)
getActivity().findViewById(R.id.search_bar_enabled);
TextView searchButton = (TextView)
getActivity().findViewById(R.id.main_search_bar_text);
langButton = (TextView)
getActivity().findViewById(R.id.search_lang_button);
-langButtonContainer = (FrameLayout)
getActivity().findViewById(R.id.search_lang_button_container);
+FrameLayout langButtonContainer = (FrameLayout)
[MediaWiki-commits] [Gerrit] bug fix for mapping explicit value list - change (mediawiki...SemanticForms)
Cicalese has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234711
Change subject: bug fix for mapping explicit value list
..
bug fix for mapping explicit value list
Change-Id: Iffcb3e7cb69e6c308547dc2cf47ff342ad26b2fa
---
M includes/SF_FormPrinter.php
1 file changed, 15 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms
refs/changes/11/234711/1
diff --git a/includes/SF_FormPrinter.php b/includes/SF_FormPrinter.php
index 149635e..5f582d4 100644
--- a/includes/SF_FormPrinter.php
+++ b/includes/SF_FormPrinter.php
@@ -1072,6 +1072,21 @@
}
} // end for
+
+ if ( array_key_exists( 'delimiter',
$field_args ) ) {
+ $delimiter =
$field_args['delimiter'];
+ } else {
+ $delimiter = ,;
+ }
+
+ // If the 'values' parameter was set,
separate it based on the
+ // 'delimiter' parameter, if any.
+ if ( ! empty( $values ) ) {
+ // Remove whitespaces, and
un-escape characters
+ $possible_values = array_map(
'trim', explode( $delimiter, $values ) );
+ $possible_values = array_map(
'htmlspecialchars_decode', $possible_values );
+ }
+
// If we're using Cargo, there's no
// equivalent for values from property
// - instead, we just always get the
@@ -1107,11 +1122,6 @@
}
if ( count( $show_on_select ) 0 ) {
$field_args['show on select'] =
$show_on_select;
- }
- if ( array_key_exists( 'delimiter',
$field_args ) ) {
- $delimiter =
$field_args['delimiter'];
- } else {
- $delimiter = ,;
}
// Get the value from the request, if
@@ -1294,15 +1304,6 @@
$field_args['origName']
= $template_name . '[' . $field_name . ']';
} else {
$input_name =
$template_name . '[' . $field_name . ']';
- }
-
-
- // If the 'values' parameter
was set, separate it based on the
- // 'delimiter' parameter, if
any.
- if ( ! empty( $values ) ) {
- // Remove whitespaces,
and un-escape characters
- $possible_values =
array_map( 'trim', explode( $delimiter, $values ) );
- $possible_values =
array_map( 'htmlspecialchars_decode', $possible_values );
}
// if we're creating the page
name from a formula based on
--
To view, visit https://gerrit.wikimedia.org/r/234711
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iffcb3e7cb69e6c308547dc2cf47ff342ad26b2fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Cicalese cical...@mitre.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove redundant field from LinkPreviewFunnel - change (apps...wikipedia)
Deskana has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234713
Change subject: Remove redundant field from LinkPreviewFunnel
..
Remove redundant field from LinkPreviewFunnel
A page title was being passed to the constructor for LinkPreviewFunnel,
which was then never actually used for anything. I assume this was used
for something in the past. Either way, it's not being used at all now.
This patch removes the field and alters all the calls to the constructor
so that it's not passed any more, to optimise performance and improve
code tidiness.
Change-Id: Ie99666ec6a9f4f0f34a1dc56f7a2e9387b72df4f
---
M app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
M app/src/main/java/org/wikipedia/page/PageFragment.java
M app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
3 files changed, 3 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/13/234713/1
diff --git a/app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
b/app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
index e3c2b82..67a29c3 100644
--- a/app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
+++ b/app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
@@ -12,11 +12,8 @@
private static final int PROD_LINK_PREVIEW_VERSION = 3;
private final int version;
-private final PageTitle title;
-
-public LinkPreviewFunnel(WikipediaApp app, PageTitle title) {
+public LinkPreviewFunnel(WikipediaApp app) {
super(app, SCHEMA_NAME, REV_ID, app.isProdRelease() ?
Funnel.SAMPLE_LOG_100 : Funnel.SAMPLE_LOG_ALL);
-this.title = title;
version = app.isProdRelease() ? PROD_LINK_PREVIEW_VERSION :
app.getLinkPreviewVersion();
}
diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index ff1779f..dcdaf62 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -403,7 +403,7 @@
if (!app.isProdRelease() app.getLinkPreviewVersion() == 0) {
HistoryEntry historyEntry = new HistoryEntry(title,
HistoryEntry.SOURCE_INTERNAL_LINK);
getPageActivity().displayNewPage(title, historyEntry);
-new LinkPreviewFunnel(app, title).logNavigate();
+new LinkPreviewFunnel(app).logNavigate();
} else {
getPageActivity().showLinkPreview(title,
HistoryEntry.SOURCE_INTERNAL_LINK);
}
diff --git
a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
index 9fab470..ae4c7f9 100755
--- a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
+++ b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
@@ -136,7 +136,7 @@
// and kick off the task to load all the things...
new LinkPreviewFetchTask(app.getAPIForSite(pageTitle.getSite()),
pageTitle).execute();
-funnel = new LinkPreviewFunnel(app, pageTitle);
+funnel = new LinkPreviewFunnel(app);
funnel.logLinkClick();
return rootView;
--
To view, visit https://gerrit.wikimedia.org/r/234713
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie99666ec6a9f4f0f34a1dc56f7a2e9387b72df4f
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Deskana dga...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Convert some fields to local variables. - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Convert some fields to local variables.
..
Convert some fields to local variables.
This patch converts some fields that are only used in a single method to
local variables, to optimise performance and maintain code tidiness.
Change-Id: Ia38f84ecdc87c66a3924b06b43d19e31f7131691
---
M app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
M app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java
M app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
3 files changed, 3 insertions(+), 6 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
b/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
index a4e71aa..2cc2af6 100644
---
a/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
+++
b/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
@@ -61,7 +61,6 @@
private View bottomContentContainer;
private TextView pageLastUpdatedText;
private TextView pageLicenseText;
-private TextView pageExternalLink;
private View readMoreContainer;
private ListView readMoreList;
@@ -88,7 +87,7 @@
readMoreContainer =
bottomContentContainer.findViewById(R.id.read_more_container);
readMoreList =
(ListView)bottomContentContainer.findViewById(R.id.read_more_list);
-pageExternalLink = (TextView)
bottomContentContainer.findViewById(R.id.page_external_link);
+TextView pageExternalLink = (TextView)
bottomContentContainer.findViewById(R.id.page_external_link);
pageExternalLink.setPaintFlags(pageExternalLink.getPaintFlags() |
Paint.UNDERLINE_TEXT_FLAG);
pageExternalLink.setOnClickListener(new View.OnClickListener() {
@Override
diff --git
a/app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java
b/app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java
index babd012..8d5bbc8 100644
---
a/app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java
+++
b/app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java
@@ -50,7 +50,6 @@
*/
public abstract class SwipeableBottomDialog extends DialogFragment {
private final ListView dialogViews = new ArrayList();
-private ViewGroup rootView;
private ListView dialogListView;
private int dialogPeekHeight;
@@ -76,7 +75,7 @@
int displayWidth = getDialogWidth();
int displayHeight =
inflater.getContext().getResources().getDisplayMetrics().heightPixels;
-rootView = (ViewGroup) inflater.inflate(R.layout.dialog_bottom_swipe,
container);
+ViewGroup rootView = (ViewGroup)
inflater.inflate(R.layout.dialog_bottom_swipe, container);
dialogViews.add(makeSpaceView(displayWidth, 1));
dialogViews.add(makeSpaceView(displayWidth, dialogPeekHeight));
diff --git a/app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
b/app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
index e19cf49..4d4d897 100644
--- a/app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
+++ b/app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
@@ -44,7 +44,6 @@
private EditText searchEditText;
private SearchFunnel funnel;
private TextView langButton;
-private FrameLayout langButtonContainer;
public SearchFunnel getFunnel() {
return funnel;
@@ -287,7 +286,7 @@
LinearLayout enabledSearchBar = (LinearLayout)
getActivity().findViewById(R.id.search_bar_enabled);
TextView searchButton = (TextView)
getActivity().findViewById(R.id.main_search_bar_text);
langButton = (TextView)
getActivity().findViewById(R.id.search_lang_button);
-langButtonContainer = (FrameLayout)
getActivity().findViewById(R.id.search_lang_button_container);
+FrameLayout langButtonContainer = (FrameLayout)
getActivity().findViewById(R.id.search_lang_button_container);
if (enabled) {
// set up the language picker
--
To view, visit https://gerrit.wikimedia.org/r/234712
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia38f84ecdc87c66a3924b06b43d19e31f7131691
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Deskana dga...@wikimedia.org
Gerrit-Reviewer: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Dbrant dbr...@wikimedia.org
Gerrit-Reviewer: Mholloway mhollo...@wikimedia.org
Gerrit-Reviewer: Niedzielski sniedziel...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits
[MediaWiki-commits] [Gerrit] Remove redundant field from LinkPreviewFunnel - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove redundant field from LinkPreviewFunnel
..
Remove redundant field from LinkPreviewFunnel
A page title was being passed to the constructor for LinkPreviewFunnel,
which was then never actually used for anything. I assume this was used
for something in the past. Either way, it's not being used at all now.
This patch removes the field and alters all the calls to the constructor
so that it's not passed any more, to optimise performance and improve
code tidiness.
Change-Id: Ie99666ec6a9f4f0f34a1dc56f7a2e9387b72df4f
---
M app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
M app/src/main/java/org/wikipedia/page/PageFragment.java
M app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
3 files changed, 3 insertions(+), 7 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
b/app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
index e3c2b82..ee650d9 100644
--- a/app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
+++ b/app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
@@ -3,7 +3,6 @@
import android.support.annotation.NonNull;
import org.json.JSONObject;
-import org.wikipedia.page.PageTitle;
import org.wikipedia.WikipediaApp;
public class LinkPreviewFunnel extends TimedFunnel {
@@ -12,11 +11,8 @@
private static final int PROD_LINK_PREVIEW_VERSION = 3;
private final int version;
-private final PageTitle title;
-
-public LinkPreviewFunnel(WikipediaApp app, PageTitle title) {
+public LinkPreviewFunnel(WikipediaApp app) {
super(app, SCHEMA_NAME, REV_ID, app.isProdRelease() ?
Funnel.SAMPLE_LOG_100 : Funnel.SAMPLE_LOG_ALL);
-this.title = title;
version = app.isProdRelease() ? PROD_LINK_PREVIEW_VERSION :
app.getLinkPreviewVersion();
}
diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index ff1779f..dcdaf62 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -403,7 +403,7 @@
if (!app.isProdRelease() app.getLinkPreviewVersion() == 0) {
HistoryEntry historyEntry = new HistoryEntry(title,
HistoryEntry.SOURCE_INTERNAL_LINK);
getPageActivity().displayNewPage(title, historyEntry);
-new LinkPreviewFunnel(app, title).logNavigate();
+new LinkPreviewFunnel(app).logNavigate();
} else {
getPageActivity().showLinkPreview(title,
HistoryEntry.SOURCE_INTERNAL_LINK);
}
diff --git
a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
index 9fab470..ae4c7f9 100755
--- a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
+++ b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
@@ -136,7 +136,7 @@
// and kick off the task to load all the things...
new LinkPreviewFetchTask(app.getAPIForSite(pageTitle.getSite()),
pageTitle).execute();
-funnel = new LinkPreviewFunnel(app, pageTitle);
+funnel = new LinkPreviewFunnel(app);
funnel.logLinkClick();
return rootView;
--
To view, visit https://gerrit.wikimedia.org/r/234713
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie99666ec6a9f4f0f34a1dc56f7a2e9387b72df4f
Gerrit-PatchSet: 3
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Deskana dga...@wikimedia.org
Gerrit-Reviewer: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Dbrant dbr...@wikimedia.org
Gerrit-Reviewer: Mholloway mhollo...@wikimedia.org
Gerrit-Reviewer: Niedzielski sniedziel...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add interwikidata translation files - change (pywikibot/i18n)
jenkins-bot has submitted this change and it was merged.
Change subject: Add interwikidata translation files
..
Add interwikidata translation files
Change-Id: I06eef067275cc1c9f413104f1f0029ed37db8941
---
M Gruntfile.js
A interwikidata/en.json
A interwikidata/fa.json
A interwikidata/qqq.json
4 files changed, 25 insertions(+), 0 deletions(-)
Approvals:
XZise: Looks good to me, but someone else must approve
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gruntfile.js b/Gruntfile.js
index aceef5b..1849c7b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -30,6 +30,7 @@
fixing_redirects: 'fixing_redirects/',
followlive: 'followlive/',
interwiki: 'interwiki/',
+ interwikidata: 'interwikidata/',
isbn: 'isbn/',
lonelypages: 'lonelypages/',
makecat: 'makecat/',
diff --git a/interwikidata/en.json b/interwikidata/en.json
new file mode 100644
index 000..ec33efb
--- /dev/null
+++ b/interwikidata/en.json
@@ -0,0 +1,8 @@
+{
+ @metadata: {
+ authors: [
+ Ladsgroup
+ ]
+ },
+ interwikidata-clean-summary: Bot: Cleaning up old interwiki links
+}
diff --git a/interwikidata/fa.json b/interwikidata/fa.json
new file mode 100644
index 000..30e04d8
--- /dev/null
+++ b/interwikidata/fa.json
@@ -0,0 +1,8 @@
+{
+ @metadata: {
+ authors: [
+ Ladsgroup
+ ]
+ },
+ interwikidata-clean-summary: ربات: حذف پیوندهای میانویکی که در
ویکیداده موجود است
+}
diff --git a/interwikidata/qqq.json b/interwikidata/qqq.json
new file mode 100644
index 000..27029e6
--- /dev/null
+++ b/interwikidata/qqq.json
@@ -0,0 +1,8 @@
+{
+ @metadata: {
+ authors: [
+ Ladsgroup
+ ]
+ },
+ interwikidata-clean-summary: Edit summary when bot cleans pages from
old interwiki links.
+}
--
To view, visit https://gerrit.wikimedia.org/r/233108
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I06eef067275cc1c9f413104f1f0029ed37db8941
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/i18n
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: XZise commodorefabia...@gmx.de
Gerrit-Reviewer: Xqt i...@gno.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Check surface is visible before trying to render fragments - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Check surface is visible before trying to render fragments
..
Check surface is visible before trying to render fragments
Bug: T110538
Change-Id: I292bff99cd9af20f8fae5078d7c6d576a14a9063
---
M src/ui/dialogs/ve.ui.FindAndReplaceDialog.js
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/ui/dialogs/ve.ui.FindAndReplaceDialog.js
b/src/ui/dialogs/ve.ui.FindAndReplaceDialog.js
index 6705b0d..268c13f 100644
--- a/src/ui/dialogs/ve.ui.FindAndReplaceDialog.js
+++ b/src/ui/dialogs/ve.ui.FindAndReplaceDialog.js
@@ -56,7 +56,7 @@
this.results = 0;
// Range over the list of fragments indicating which ones where
rendered,
// e.g. [1,3] means fragments 1 2 were rendered
- this.renderedFragments = null;
+ this.renderedFragments = new ve.Range();
this.replacing = false;
this.focusedIndex = 0;
this.query = null;
@@ -321,7 +321,11 @@
ve.ui.FindAndReplaceDialog.prototype.renderFragments = function () {
var i, selection, viewportRange, start, end;
- if ( this.replacing ) {
+ if (
+ this.replacing ||
+ // Check the surface isn't hidden, such as during deactivation
+ !this.surface.getView().$element.is( ':visible' )
+ ) {
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/234511
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I292bff99cd9af20f8fae5078d7c6d576a14a9063
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix focusable mouseout - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix focusable mouseout
..
Fix focusable mouseout
We should detect mouseout of this.$focusable, not this.$element.
Bug: T110195
Change-Id: Ifd071eaccdf543a707ef839d5ea0f715e9d2be8c
---
M src/ce/ve.ce.FocusableNode.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/ce/ve.ce.FocusableNode.js b/src/ce/ve.ce.FocusableNode.js
index b4ceaa7..2693d57 100644
--- a/src/ce/ve.ce.FocusableNode.js
+++ b/src/ce/ve.ce.FocusableNode.js
@@ -285,7 +285,7 @@
var $target = $( e.target );
if (
!$target.hasClass( 've-ce-focusableNode-highlight' )
- $target.closest( '.ve-ce-focusableNode' ).length === 0
+ !OO.ui.contains( this.$focusable.toArray(), $target[ 0 ], true )
) {
this.clearHighlights();
}
--
To view, visit https://gerrit.wikimedia.org/r/232773
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd071eaccdf543a707ef839d5ea0f715e9d2be8c
Gerrit-PatchSet: 3
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: rename util.js to service-util.js - change (mediawiki...mobileapps)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: rename util.js to service-util.js
..
Hygiene: rename util.js to service-util.js
lib/util.js is meant to be for utilities powering the service, not
utilities for the service itself. Rename this file to avoid confusion
when adding other utilities.
Change-Id: I9b6bcb806d50d43ff8b8a270b7f2c5c9ea935189
---
M app.js
M doc/template.md
M lib/mwapi.js
R lib/service-util.js
M routes/info.js
M routes/mobile-html-sections.js
M routes/mobile-html.js
M routes/mobile-text.js
M routes/root.js
9 files changed, 9 insertions(+), 8 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app.js b/app.js
index 434e77b..d36a7aa 100644
--- a/app.js
+++ b/app.js
@@ -7,7 +7,7 @@
var compression = require('compression');
var bodyParser = require('body-parser');
var fs = BBPromise.promisifyAll(require('fs'));
-var sUtil = require('./lib/util');
+var sUtil = require('./lib/service-util');
var packageInfo = require('./package.json');
var yaml = require('js-yaml');
diff --git a/doc/template.md b/doc/template.md
index f9d28ad..d2a3ae5 100644
--- a/doc/template.md
+++ b/doc/template.md
@@ -57,7 +57,8 @@
- [`app.js`](../app.js) - contains the application declaration and loading
logic
- [`routes`](../routes/) - contains the definitions of the loaded routes; this
is where most of your coding is to take place
-- [`lib/util.js`](../lib/util.js) - contains some utility functions and classes
+- [`lib/service-util.js`](../lib/service-util.js) - contains some service
+ utility functions and classes
- [`static`](../static/) - this is where served static files go (HTML, CSS,
client-side JS, etc.)
- [`test`](../test/) - contains the test files for the example routes in the
diff --git a/lib/mwapi.js b/lib/mwapi.js
index c7c6a73..c9c5495 100644
--- a/lib/mwapi.js
+++ b/lib/mwapi.js
@@ -5,7 +5,7 @@
'use strict';
var preq = require('preq');
-var sUtil = require('../lib/util');
+var sUtil = require('../lib/service-util');
// shortcut
var HTTPError = sUtil.HTTPError;
diff --git a/lib/util.js b/lib/service-util.js
similarity index 100%
rename from lib/util.js
rename to lib/service-util.js
diff --git a/routes/info.js b/routes/info.js
index 5dd2590..ce20744 100644
--- a/routes/info.js
+++ b/routes/info.js
@@ -1,7 +1,7 @@
'use strict';
-var sUtil = require('../lib/util');
+var sUtil = require('../lib/service-util');
/**
diff --git a/routes/mobile-html-sections.js b/routes/mobile-html-sections.js
index 8cab463..f17a733 100644
--- a/routes/mobile-html-sections.js
+++ b/routes/mobile-html-sections.js
@@ -13,7 +13,7 @@
var BBPromise = require('bluebird');
var preq = require('preq');
-var sUtil = require('../lib/util');
+var sUtil = require('../lib/service-util');
var transforms = require('../lib/transforms');
var mwapi = require('../lib/mwapi');
var gallery = require('../lib/gallery');
diff --git a/routes/mobile-html.js b/routes/mobile-html.js
index 038cf39..6b2b726 100644
--- a/routes/mobile-html.js
+++ b/routes/mobile-html.js
@@ -18,7 +18,7 @@
var BBPromise = require('bluebird');
var preq = require('preq');
var domino = require('domino');
-var sUtil = require('../lib/util');
+var sUtil = require('../lib/service-util');
var util = require('util');
var transforms = require('../lib/transforms');
var mwapi = require('../lib/mwapi');
diff --git a/routes/mobile-text.js b/routes/mobile-text.js
index 0a947f7..3127cb4 100644
--- a/routes/mobile-text.js
+++ b/routes/mobile-text.js
@@ -15,7 +15,7 @@
//var BBPromise = require('bluebird');
var preq = require('preq');
var domino = require('domino');
-var sUtil = require('../lib/util');
+var sUtil = require('../lib/service-util');
var mwapi = require('../lib/mwapi');
// shortcut
diff --git a/routes/root.js b/routes/root.js
index 3b34d8e..a6f6acc 100644
--- a/routes/root.js
+++ b/routes/root.js
@@ -1,7 +1,7 @@
'use strict';
-var sUtil = require('../lib/util');
+var sUtil = require('../lib/service-util');
/**
--
To view, visit https://gerrit.wikimedia.org/r/234558
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9b6bcb806d50d43ff8b8a270b7f2c5c9ea935189
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Niedzielski sniedziel...@wikimedia.org
Gerrit-Reviewer: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: Bgerstle bgers...@wikimedia.org
Gerrit-Reviewer: Dbrant dbr...@wikimedia.org
Gerrit-Reviewer: Fjalapeno cfl...@wikimedia.org
Gerrit-Reviewer: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Mholloway mhollo...@wikimedia.org
Gerrit-Reviewer: Mhurd mh...@wikimedia.org
Gerrit-Reviewer: Mobrovac mobro...@wikimedia.org
Gerrit-Reviewer: Niedzielski sniedziel...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
[MediaWiki-commits] [Gerrit] T110692: Massage batching API imageinfo width/height to numbers - change (mediawiki...parsoid)
Subramanya Sastry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234714
Change subject: T110692: Massage batching API imageinfo width/height to numbers
..
T110692: Massage batching API imageinfo width/height to numbers
Change-Id: I6a0b9d2a0c5bd52ac74b64370dad8f85c4fcd76b
---
M lib/ext.core.LinkHandler.js
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/14/234714/1
diff --git a/lib/ext.core.LinkHandler.js b/lib/ext.core.LinkHandler.js
index 61e1e84..cbbded5 100644
--- a/lib/ext.core.LinkHandler.js
+++ b/lib/ext.core.LinkHandler.js
@@ -1011,6 +1011,11 @@
}
}
+ // T110692: The batching API seems to return these as strings.
+ // Till that is fixed, let us make sure these are numbers.
+ info.height = Number(info.height);
+ info.width = Number(info.width);
+
var imageSrc = dataAttribs.src;
if (!dataAttribs.uneditable) {
dataAttribs.src = undefined;
@@ -1068,6 +1073,7 @@
size.width = Math.round(info.width * ratio);
}
}
+
if (size.height) {
img.addNormalizedAttribute('height', size.height.toString());
}
@@ -1075,7 +1081,6 @@
if (size.width) {
img.addNormalizedAttribute('width', size.width.toString());
}
-
// If the format is something we *recognize*, add the subtype
switch (format) {
case 'thumbnail':
--
To view, visit https://gerrit.wikimedia.org/r/234714
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a0b9d2a0c5bd52ac74b64370dad8f85c4fcd76b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] elasticsearch: allow port forwarding - change (mediawiki/vagrant)
BryanDavis has uploaded a new change for review. https://gerrit.wikimedia.org/r/234715 Change subject: elasticsearch: allow port forwarding .. elasticsearch: allow port forwarding Binding to 127.0.0.1 disables Vagrant from allowing access to Elasticsearch because forwarded ports hit the public address of the VM. Now that dynamic scripting is disabled by default we can disable the protection added in Ifb4253d and again allow easy developer access to the Elasticsearch service. Change-Id: If5385eeb4cf56eb4a25f478875e1ccd3230cc9b5 --- M puppet/modules/elasticsearch/files/elasticsearch.yml 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/15/234715/1 diff --git a/puppet/modules/elasticsearch/files/elasticsearch.yml b/puppet/modules/elasticsearch/files/elasticsearch.yml index 23665bb..ffc92c4 100644 --- a/puppet/modules/elasticsearch/files/elasticsearch.yml +++ b/puppet/modules/elasticsearch/files/elasticsearch.yml @@ -1,2 +1 @@ -## Turn off global accessibility. -network.host: 127.0.0.1 +# This file managed by puppet -- To view, visit https://gerrit.wikimedia.org/r/234715 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If5385eeb4cf56eb4a25f478875e1ccd3230cc9b5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: BryanDavis bda...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] AnnotationInspector: Only show 'insert' when content is to b... - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: AnnotationInspector: Only show 'insert' when content is to be
inserted
..
AnnotationInspector: Only show 'insert' when content is to be inserted
Currently 'insert' means that a new annotation will be applied, which
is a little confusing. Everywhere else, 'insert' means insert new
contents. Just use 'done' unless new text is actually going to be
inserted (i.e., the inspector was opened on a collapsed selection).
Change-Id: I0ad81f565b585def4687437b317a15a75371b257
---
M src/ui/inspectors/ve.ui.AnnotationInspector.js
1 file changed, 2 insertions(+), 4 deletions(-)
Approvals:
Alex Monk: Looks good to me, but someone else must approve
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/ui/inspectors/ve.ui.AnnotationInspector.js
b/src/ui/inspectors/ve.ui.AnnotationInspector.js
index 9104254..5a7ba20 100644
--- a/src/ui/inspectors/ve.ui.AnnotationInspector.js
+++ b/src/ui/inspectors/ve.ui.AnnotationInspector.js
@@ -145,10 +145,8 @@
* @inheritdoc
*/
ve.ui.AnnotationInspector.prototype.getMode = function () {
- if ( this.fragment ) {
- // Trim the fragment before getting selected models to match
the behavior of
- // #getSetupProcess
- return
this.fragment.trimLinearSelection().getSelectedModels().length ? 'edit' :
'insert';
+ if ( this.initialSelection ) {
+ return this.initialSelection.isCollapsed() ? 'insert' : 'edit';
}
return '';
};
--
To view, visit https://gerrit.wikimedia.org/r/234279
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0ad81f565b585def4687437b317a15a75371b257
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Really actually fix the typo in Parser.php - change (mediawiki/core)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234716
Change subject: Really actually fix the typo in Parser.php
..
Really actually fix the typo in Parser.php
Change-Id: I9d9c6f13095087ac2c2c6693c6bd1613219bf658
---
M includes/parser/Parser.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/16/234716/1
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 977aebe..664f0a4 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -511,7 +511,7 @@
}
$limitReport .= 'Cached time: ' .
$this-mOutput-getCacheTime() . \n;
$limitReport .= 'Cache expiry: ' .
$this-mOutput-getCacheExpiry() . \n;
- $limitReport .= 'Dynanmic content: ' . (
$this-mOutput-hasDynamicContent() ? 'true' : 'false' ) . \n;
+ $limitReport .= 'Dynamic content: ' . (
$this-mOutput-hasDynamicContent() ? 'true' : 'false' ) . \n;
foreach ( $this-mOutput-getLimitReportData() as $key
= $value ) {
if ( Hooks::run( 'ParserLimitReportFormat',
array( $key, $value, $limitReport,
false, false )
--
To view, visit https://gerrit.wikimedia.org/r/234716
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d9c6f13095087ac2c2c6693c6bd1613219bf658
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Really actually fix the typo in Parser.php - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Really actually fix the typo in Parser.php
..
Really actually fix the typo in Parser.php
Change-Id: I9d9c6f13095087ac2c2c6693c6bd1613219bf658
---
M includes/parser/Parser.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ricordisamoa: Looks good to me, but someone else must approve
Aaron Schulz: Looks good to me, approved
Brian Wolff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 977aebe..664f0a4 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -511,7 +511,7 @@
}
$limitReport .= 'Cached time: ' .
$this-mOutput-getCacheTime() . \n;
$limitReport .= 'Cache expiry: ' .
$this-mOutput-getCacheExpiry() . \n;
- $limitReport .= 'Dynanmic content: ' . (
$this-mOutput-hasDynamicContent() ? 'true' : 'false' ) . \n;
+ $limitReport .= 'Dynamic content: ' . (
$this-mOutput-hasDynamicContent() ? 'true' : 'false' ) . \n;
foreach ( $this-mOutput-getLimitReportData() as $key
= $value ) {
if ( Hooks::run( 'ParserLimitReportFormat',
array( $key, $value, $limitReport,
false, false )
--
To view, visit https://gerrit.wikimedia.org/r/234716
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9d9c6f13095087ac2c2c6693c6bd1613219bf658
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Brian Wolff bawolff...@gmail.com
Gerrit-Reviewer: Cscott canan...@wikimedia.org
Gerrit-Reviewer: Jackmcbarn jackmcb...@gmail.com
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Ricordisamoa ricordisa...@openmailbox.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Load mwimage support in VE - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Load mwimage support in VE .. Load mwimage support in VE VE-core's image support breaks when consuming MW images, so load VE-MW's image support to deal with this. Bug: T110758 Change-Id: Iba59d2a5d2b74fc082d6b4f9606464717b63f2d5 --- M Resources.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Mattflaschen: Looks good to me, approved jenkins-bot: Verified diff --git a/Resources.php b/Resources.php index fdbaa46..d68a676 100644 --- a/Resources.php +++ b/Resources.php @@ -536,6 +536,7 @@ 'ext.visualEditor.icons', // See comment at bottom of mw.flow.ve.Target.js. 'ext.visualEditor.mediawiki', + 'ext.visualEditor.mwimage', 'ext.visualEditor.mwlink', 'ext.visualEditor.mwtransclusion', 'ext.visualEditor.standalone', -- To view, visit https://gerrit.wikimedia.org/r/234709 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iba59d2a5d2b74fc082d6b4f9606464717b63f2d5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Catrope roan.katt...@gmail.com Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Breaking change: No longer autoload with composer - change (mediawiki...UniversalLanguageSelector)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234561
Change subject: Breaking change: No longer autoload with composer
..
Breaking change: No longer autoload with composer
Use wfLoadExtension or require_once instead
Change-Id: I78fe1f19a157f09b034499e3fb5417e7793c1d13
---
M UniversalLanguageSelector.php
M composer.json
2 files changed, 34 insertions(+), 37 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/61/234561/1
diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php
index 338e078..97e322c 100644
--- a/UniversalLanguageSelector.php
+++ b/UniversalLanguageSelector.php
@@ -21,7 +21,7 @@
if ( function_exists( 'wfLoadExtension' ) ) {
wfLoadExtension( 'UniversalLanguageSelector' );
// Keep i18n globals so mergeMessageFileList.php doesn't break
- $GLOBALS['wgMessagesDirs']['UniversalLanguageSelector'] = __DIR__ .
'/i18n';
+ $wgMessagesDirs['UniversalLanguageSelector'] = __DIR__ . '/i18n';
/* wfWarn(
'Deprecated PHP entry point used for UniversalLanguageSelector
extension. Please use wfLoadExtension instead, ' .
'see https://www.mediawiki.org/wiki/Extension_registration for
more details.'
@@ -38,7 +38,7 @@
*/
define( 'ULS_VERSION', '2015-08-28' );
-$GLOBALS['wgExtensionCredits']['other'][] = array(
+$wgExtensionCredits['other'][] = array(
'path' = __FILE__,
'name' = 'UniversalLanguageSelector',
'version' = ULS_VERSION,
@@ -65,7 +65,7 @@
*
* The service should return jsonp that uses the supplied callback parameter.
*/
-$GLOBALS['wgULSGeoService'] = true;
+$wgULSGeoService = true;
/**
* Enable language selection, input methods and webfonts for everyone, unless
@@ -75,14 +75,14 @@
* use of other extensions. Language changing via cookie or setlang query
* parameter is not possible.
*/
-$GLOBALS['wgULSEnable'] = true;
+$wgULSEnable = true;
/**
* Equivalent to $wgULSEnable for anonymous users only.
*
* Does not have any effect if $wgULSEnable is false.
*/
-$GLOBALS['wgULSEnableAnon'] = true;
+$wgULSEnableAnon = true;
/**
* Allow anonymous users to change language with cookie and setlang
@@ -96,7 +96,7 @@
*
* @since 2013.04
*/
-$GLOBALS['wgULSAnonCanChangeLanguage'] = true;
+$wgULSAnonCanChangeLanguage = true;
/**
* Try to use preferred interface language for anonymous users.
@@ -107,26 +107,26 @@
* Does not have any effect if any of $wgULSEnable, $wgULSEnableAnon
* or $wgULSAnonCanChangeLanguage is set to false.
*/
-$GLOBALS['wgULSLanguageDetection'] = true;
+$wgULSLanguageDetection = true;
/**
* Enable the input methods feature for all users by default.
* Can be controlled by the user.
*/
-$GLOBALS['wgULSIMEEnabled'] = true;
+$wgULSIMEEnabled = true;
/**
* Enable the webfonts feature for all users by default.
* Can be controlled by the user.
* @since 2014.02
*/
-$GLOBALS['wgULSWebfontsEnabled'] = true;
+$wgULSWebfontsEnabled = true;
/**
* Set whether webfont support is loaded within the mobile interface (via the
* MobileFrontend extension).
*/
-$GLOBALS['wgULSMobileWebfontsEnabled'] = false;
+$wgULSMobileWebfontsEnabled = false;
/**
* The location and the form of the language selection trigger.
@@ -138,21 +138,21 @@
*
* @since 2013.04
*/
-$GLOBALS['wgULSPosition'] = 'personal';
+$wgULSPosition = 'personal';
/**
* Whether to use EventLogging. The EventLogging extension must be installed
* if this option is enabled.
* @since 2013.06
*/
-$GLOBALS['wgULSEventLogging'] = false;
+$wgULSEventLogging = false;
/**
* Array of jQuery selectors of elements on which IME should be enabled.
*
* @since 2013.11
*/
-$GLOBALS['wgULSImeSelectors'] = array(
+$wgULSImeSelectors = array(
'input:not([type])',
'input[type=text]',
'input[type=search]',
@@ -165,7 +165,7 @@
*
* @since 2013.07
*/
-$GLOBALS['wgULSNoImeSelectors'] = array( '#wpCaptchaWord', '.ve-ce-surface *'
);
+$wgULSNoImeSelectors = array( '#wpCaptchaWord', '.ve-ce-surface *' );
/**
* Array of jQuery selectors of elements on which webfonts must not be applied.
@@ -173,7 +173,7 @@
* Autonym
* @since 2013.09
*/
-$GLOBALS['wgULSNoWebfontsSelectors'] = array( '#p-lang li.interlanguage-link
a' );
+$wgULSNoWebfontsSelectors = array( '#p-lang li.interlanguage-link a' );
/**
* Base path of ULS font repository.
@@ -181,7 +181,7 @@
* relative to $wgExtensionAssetsPath.
* @since 2013.10
*/
-$GLOBALS['wgULSFontRepositoryBasePath'] = false;
+$wgULSFontRepositoryBasePath = false;
/**
* Whether the Compact language links Beta Feature is exposed. Requires
@@ -191,13 +191,13 @@
*
* @since 2014.03
*/
-$GLOBALS['wgULSCompactLinks'] = false;
+$wgULSCompactLinks = false;
// Internationalization
[MediaWiki-commits] [Gerrit] Remove not useful comments - change (mediawiki...UniversalLanguageSelector)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234562
Change subject: Remove not useful comments
..
Remove not useful comments
Change-Id: I99c30a6c6d6b59e86e5e3efe31f38439c5e95095
---
M UniversalLanguageSelector.hooks.php
M data/LanguageNameIndexer.php
2 files changed, 2 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/62/234562/1
diff --git a/UniversalLanguageSelector.hooks.php
b/UniversalLanguageSelector.hooks.php
index 15f510b..8ac5181 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -156,7 +156,7 @@
* @return string
*/
protected static function getDefaultLanguage( array $preferred ) {
- $supported = Language::fetchLanguageNames( null, 'mwfile' ); //
since 1.20
+ $supported = Language::fetchLanguageNames( null, 'mwfile' );
// look for a language that is acceptable to the client
// and known to the wiki.
diff --git a/data/LanguageNameIndexer.php b/data/LanguageNameIndexer.php
index 9fb5f57..0715d98 100644
--- a/data/LanguageNameIndexer.php
+++ b/data/LanguageNameIndexer.php
@@ -31,7 +31,7 @@
}
public function execute() {
- $languages = Language::fetchLanguageNames( null, 'all' ); //
since 1.20
+ $languages = Language::fetchLanguageNames( null, 'all' );
$all = array();
$buckets = array();
--
To view, visit https://gerrit.wikimedia.org/r/234562
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I99c30a6c6d6b59e86e5e3efe31f38439c5e95095
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add jobs for CLDRPluralRuleParser - change (integration/config)
Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/234569 Change subject: Add jobs for CLDRPluralRuleParser .. Add jobs for CLDRPluralRuleParser Change-Id: Ice9d46668cfc852a34930120a624abce65e56e56 --- M zuul/layout.yaml 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/69/234569/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 28d3fa1..d87df32 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -7797,6 +7797,13 @@ - doxygen-publish - phpunit-coverage-publish + - name: CLDRPluralRuleParser +template: + - name: composer-test-package +postmerge: + - doxygen-publish + - phpunit-coverage-publish + - name: wikimedia/slimapp check: - php-composer-package-validate -- To view, visit https://gerrit.wikimedia.org/r/234569 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ice9d46668cfc852a34930120a624abce65e56e56 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Krinkle krinklem...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update repository to mediawiki_selenium Ruby gem 1.x - change (mediawiki...WikiLove)
jenkins-bot has submitted this change and it was merged. Change subject: Update repository to mediawiki_selenium Ruby gem 1.x .. Update repository to mediawiki_selenium Ruby gem 1.x Bug: T99660 Change-Id: I83a5035dae72b42acf89d74b77c6f920d093fbc8 --- M Gemfile M Gemfile.lock A tests/browser/environments.yml M tests/browser/features/support/env.rb M tests/browser/features/support/pages/wikilove_page.rb 5 files changed, 81 insertions(+), 51 deletions(-) Approvals: Dduvall: Looks good to me, approved jenkins-bot: Verified diff --git a/Gemfile b/Gemfile index 11e2184..6209ad7 100755 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,4 @@ -#ruby=ruby-2.1.1 -#ruby-gemset=WikiLove - source https://rubygems.org; -gem mediawiki_selenium +gem mediawiki_selenium, ~ 1.5.0 gem rubocop, require: false diff --git a/Gemfile.lock b/Gemfile.lock index 6fbad9f..ca03a28 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,56 +5,57 @@ astrolabe (1.3.0) parser (= 2.2.0.pre.3, 3.0) builder (3.2.2) -childprocess (0.5.3) +childprocess (0.5.6) ffi (~ 1.0, = 1.0.11) -cucumber (1.3.16) +cucumber (1.3.20) builder (= 2.1.2) diff-lcs (= 1.1.3) gherkin (~ 2.12) multi_json (= 1.7.5, 2.0) - multi_test (= 0.1.1) -data_magic (0.19) + multi_test (= 0.1.2) +data_magic (0.21) faker (= 1.1.2) - yml_reader (= 0.3) + yml_reader (= 0.4) diff-lcs (1.2.5) -domain_name (0.5.20) +domain_name (0.5.24) unf (= 0.0.5, 1.0.0) faker (1.4.3) i18n (~ 0.5) -faraday (0.9.0) +faraday (0.9.1) multipart-post (= 1.2, 3) faraday-cookie_jar (0.0.6) faraday (= 0.7.4) http-cookie (~ 1.0.0) -ffi (1.9.3) +ffi (1.9.10) gherkin (2.12.2) multi_json (~ 1.3) -headless (1.0.2) +headless (2.2.0) http-cookie (1.0.2) domain_name (~ 0.5) -i18n (0.6.11) -json (1.8.1) -mediawiki_api (0.2.1) +i18n (0.7.0) +json (1.8.3) +mediawiki_api (0.4.1) faraday (~ 0.9, = 0.9.0) faraday-cookie_jar (~ 0.0, = 0.0.6) -mediawiki_selenium (0.3.2) - cucumber (~ 1.3, = 1.3.10) - headless (~ 1.0, = 1.0.1) +mediawiki_selenium (1.5.0) + cucumber (~ 1.3, = 1.3.20) + headless (~ 2.0, = 2.1.0) json (~ 1.8, = 1.8.1) - mediawiki_api (~ 0.2, = 0.2.1) + mediawiki_api (~ 0.4, = 0.4.1) page-object (~ 1.0) rest-client (~ 1.6, = 1.6.7) rspec-expectations (~ 2.14, = 2.14.4) syntax (~ 1.2, = 1.2.0) -mime-types (2.3) -multi_json (1.10.1) -multi_test (0.1.1) + thor (~ 0.19, = 0.19.1) +mime-types (2.6.1) +multi_json (1.11.2) +multi_test (0.1.2) multipart-post (2.0.0) -netrc (0.7.7) -page-object (1.0.2) +netrc (0.10.3) +page-object (1.1.0) page_navigation (= 0.9) - selenium-webdriver (= 2.42.0) - watir-webdriver (= 0.6.9) + selenium-webdriver (= 2.44.0) + watir-webdriver (= 0.6.11) page_navigation (0.9) data_magic (= 0.14) parser (2.2.0.pre.4) @@ -62,7 +63,8 @@ slop (~ 3.4, = 3.4.5) powerpack (0.0.9) rainbow (2.0.0) -rest-client (1.7.2) +rest-client (1.8.0) + http-cookie (= 1.0.2, 2.0) mime-types (= 1.16, 3.0) netrc (~ 0.7) rspec-expectations (2.99.2) @@ -74,25 +76,26 @@ rainbow (= 1.99.1, 3.0) ruby-progressbar (~ 1.4) ruby-progressbar (1.6.0) -rubyzip (1.1.6) -selenium-webdriver (2.42.0) - childprocess (= 0.5.0) +rubyzip (1.1.7) +selenium-webdriver (2.47.1) + childprocess (~ 0.5) multi_json (~ 1.0) rubyzip (~ 1.0) - websocket (~ 1.0.4) + websocket (~ 1.0) slop (3.6.0) syntax (1.2.0) +thor (0.19.1) unf (0.1.4) unf_ext -unf_ext (0.0.6) -watir-webdriver (0.6.10) - selenium-webdriver (= 2.18.0) -websocket (1.0.7) -yml_reader (0.3) +unf_ext (0.0.7.1) +watir-webdriver (0.8.0) + selenium-webdriver (= 2.46.2) +websocket (1.2.2) +yml_reader (0.5) PLATFORMS ruby DEPENDENCIES - mediawiki_selenium + mediawiki_selenium (~ 1.5.0) rubocop diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml new file mode 100644 index 000..35eb153 --- /dev/null +++ b/tests/browser/environments.yml @@ -0,0 +1,39 @@ +# Customize this configuration as necessary to provide defaults for various +# test environments. +# +# The set of defaults to use is determined by the MEDIAWIKI_ENVIRONMENT +# environment variable. +# +# export MEDIAWIKI_ENVIRONMENT=mw-vagrant-host +# bundle exec cucumber +# +# Additional variables set by the environment will override the corresponding +# defaults defined here. +# +# export MEDIAWIKI_ENVIRONMENT=mw-vagrant-host +# export MEDIAWIKI_USER=Selenium_user2 +# bundle exec cucumber +# +mw-vagrant-host: default +
[MediaWiki-commits] [Gerrit] mailman: fix no gate_news on jessie - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234573
Change subject: mailman: fix no gate_news on jessie
..
mailman: fix no gate_news on jessie
follow-up to Ib01baf00aca8c9
This was supposed to be jessie not = jessie.
Change-Id: I82040855cabca01da36ce83ede0f21b1116fc66c
---
M modules/mailman/manifests/listserve.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/73/234573/1
diff --git a/modules/mailman/manifests/listserve.pp
b/modules/mailman/manifests/listserve.pp
index 4626f6b..41d7abf 100644
--- a/modules/mailman/manifests/listserve.pp
+++ b/modules/mailman/manifests/listserve.pp
@@ -13,7 +13,7 @@
# Install as many languages as possible
include locales::extended
-if os_version ( 'debian = jessie || ubuntu = precise') {
+if os_version ( 'debian jessie || ubuntu precise') {
debconf::set { 'mailman/gate_news':
value = 'false',
--
To view, visit https://gerrit.wikimedia.org/r/234573
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I82040855cabca01da36ce83ede0f21b1116fc66c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove code supporting MediaWiki 1.23 - change (mediawiki...Translate)
Nikerabbit has uploaded a new change for review. https://gerrit.wikimedia.org/r/234559 Change subject: Remove code supporting MediaWiki 1.23 .. Remove code supporting MediaWiki 1.23 Change-Id: I7a8c33d2c341e38d4a117fbaea8961983f281bdf --- M Autoload.php M Resources.php D Translate.MyLanguage.alias.php M Translate.php D resources/js/jquery.ui.position.js D specials/SpecialMyLanguage.php 6 files changed, 1 insertion(+), 903 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate refs/changes/59/234559/1 diff --git a/Autoload.php b/Autoload.php index 5df83a4..7e25277 100644 --- a/Autoload.php +++ b/Autoload.php @@ -43,7 +43,6 @@ $al['SpecialMagic'] = $dir/specials/SpecialMagic.php; $al['SpecialManageGroups'] = $dir/specials/SpecialManageGroups.php; $al['SpecialMessageGroupStats'] = $dir/specials/SpecialMessageGroupStats.php; -$al['SpecialMyLanguage'] = $dir/specials/SpecialMyLanguage.php; $al['SpecialPageMigration'] = $dir/specials/SpecialPageMigration.php; $al['SpecialPagePreparation'] = $dir/specials/SpecialPagePreparation.php; $al['SpecialSearchTranslations'] = $dir/specials/SpecialSearchTranslations.php; diff --git a/Resources.php b/Resources.php index ba7089e..09a8714 100644 --- a/Resources.php +++ b/Resources.php @@ -125,7 +125,7 @@ 'ext.translate.statsbar', 'mediawiki.jqueryMsg', 'ext.translate.loader', - 'jquery.ui.position.custom', + 'jquery.ui.position', ), 'messages' = array( 'translate-msggroupselector-projects', @@ -525,12 +525,6 @@ $wgResourceModules['jquery.textchange'] = array( 'scripts' = 'resources/js/jquery.textchange.js', -) + $resourcePaths; - -// Use different name to not conflict with core. -// MediaWiki = 1.23 has 1.8.x, which is too old for us. -$wgResourceModules['jquery.ui.position.custom'] = array( - 'scripts' = 'resources/js/jquery.ui.position.js', ) + $resourcePaths; $wgHooks['ResourceLoaderTestModules'][] = diff --git a/Translate.MyLanguage.alias.php b/Translate.MyLanguage.alias.php deleted file mode 100644 index c767c95..000 --- a/Translate.MyLanguage.alias.php +++ /dev/null @@ -1,309 +0,0 @@ -?php -/** - * Aliases for the Special:MyLanguage of Translate extension. - * This is a backwards compatibility file that separates the translations - * in the extension from the translations of the same page's name - * in core MediaWiki. For more information see the following bug: - * https://phabricator.wikimedia.org/T71461 - * - * @file - * @license GPL-2.0+ - */ -// @codingStandardsIgnoreFile - -$specialPageAliases = array(); - -/** English (English) */ -$specialPageAliases['en'] = array( - 'MyLanguage' = array( 'MyLanguage' ), -); - -/** Afrikaans (Afrikaans) */ -$specialPageAliases['af'] = array( - 'MyLanguage' = array( 'MyTaal' ), -); - -/** Arabic (العربية) */ -$specialPageAliases['ar'] = array( - 'MyLanguage' = array( 'لغتي' ), -); - -/** Aramaic (ܐܪܡܝܐ) */ -$specialPageAliases['arc'] = array( - 'MyLanguage' = array( 'ܠܫܢܐ_ܕܝܠܝ' ), -); - -/** Egyptian Spoken Arabic (مصرى) */ -$specialPageAliases['arz'] = array( - 'MyLanguage' = array( 'اللغة_بتاعتى' ), -); - -/** Assamese (অসমীয়া) */ -$specialPageAliases['as'] = array( - 'MyLanguage' = array( 'মোৰ_ভাষা' ), -); - -/** Banjar (Bahasa Banjar) */ -$specialPageAliases['bjn'] = array( - 'MyLanguage' = array( 'Bahasa_ulun' ), -); - -/** Breton (brezhoneg) */ -$specialPageAliases['br'] = array( - 'MyLanguage' = array( 'MaYezh' ), -); - -/** буряад (буряад) */ -$specialPageAliases['bxr'] = array( - 'MyLanguage' = array( 'Минии_хэлэн' ), -); - -/** Min Dong Chinese (Mìng-dĕ̤ng-ngṳ̄) */ -$specialPageAliases['cdo'] = array( - 'MyLanguage' = array( '我其語言' ), -); - -/** Chechen (нохчийн) */ -$specialPageAliases['ce'] = array( - 'MyLanguage' = array( 'Сан_мотт' ), -); - -/** German (Deutsch) */ -$specialPageAliases['de'] = array( - 'MyLanguage' = array( 'Meine_Sprache' ), -); - -/** Zazaki (Zazaki) */ -$specialPageAliases['diq'] = array( - 'MyLanguage' = array( 'ZıwaneMe' ), -); - -/** Greek (Ελληνικά) */ -$specialPageAliases['el'] = array( - 'MyLanguage' = array( 'ΗΓλώσσαΜου' ), -); - -/** Esperanto (Esperanto) */ -$specialPageAliases['eo'] = array( - 'MyLanguage' = array( 'Mia_lingvo' ), -); - -/** Spanish (español) */ -$specialPageAliases['es'] = array( - 'MyLanguage' = array( 'MiIdioma', 'Mi_idioma' ), -); - -/** Persian (فارسی) */ -$specialPageAliases['fa'] = array( - 'MyLanguage' = array( 'زبانهای_من' ), -); - -/** Finnish (suomi) */ -$specialPageAliases['fi'] = array( - 'MyLanguage' = array( 'Oma_kieli' ), -); - -/** French (français) */ -$specialPageAliases['fr'] = array( - 'MyLanguage' = array( 'MaLangue', 'Ma_langue' ), -); - -/** Swiss German (Alemannisch) */
[MediaWiki-commits] [Gerrit] Allow zero-length descriptions in both S:EF and standard edits - change (mediawiki...Flow)
Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234575
Change subject: Allow zero-length descriptions in both S:EF and standard edits
..
Allow zero-length descriptions in both S:EF and standard edits
This removes the check for zero length when inserting
to External Store, and a similar check in Special:EnableFlow.
Related i18n changes
Bug: T108348
Change-Id: Ie409962f27e2cd5b8d1f8fde579c7536195a8020
---
M i18n/en.json
M i18n/qqq.json
M includes/Data/Storage/RevisionStorage.php
M includes/Specials/SpecialEnableFlow.php
4 files changed, 5 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/75/234575/1
diff --git a/i18n/en.json b/i18n/en.json
index 82bb641..bc87b6d 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -133,7 +133,7 @@
flow-error-lock-moderated-post: You cannot mark a moderated post as
resolved.,
flow-error-external-multi: Errors were encountered.br /$1,
flow-error-missing-content: Post has no content. Content is required
to save a post.,
- flow-error-missing-summary: Summary has no content. Content is
required to save a summary.,
+ flow-error-missing-summary: You must submit a summary.,
flow-error-missing-title: Topic has no title. Title is required to
save a topic.,
flow-error-parsoid-failure: Unable to parse content due to a Parsoid
failure.,
flow-error-missing-replyto: No \replyTo\ parameter was supplied.
This parameter is required for the \reply\ action.,
@@ -160,7 +160,7 @@
flow-error-title-too-long: Topic titles are restricted to $1
{{PLURAL:$1|byte|bytes}}.,
flow-error-no-existing-workflow: This workflow does not yet exist.,
flow-error-not-a-post: Topic title cannot be saved as a post.,
- flow-error-missing-header-content: Description has no content. Some
content is required to save a description.,
+ flow-error-missing-header-content: You must submit a description.,
flow-error-missing-prev-revision-identifier: Previous revision
identifier is missing.,
flow-error-prev-revision-mismatch: Another user just edited this
post a few seconds ago. Are {{GENDER:$3|you}} sure you want to overwrite the
recent change?,
flow-error-prev-revision-does-not-exist: Could not find the previous
revision.,
@@ -395,7 +395,6 @@
flow-special-enableflow-board-already-exists: There is already a
Flow board at [[$1]].,
flow-special-enableflow-invalid-title: An invalid page title was
provided,
flow-special-enableflow-board-creation-not-allowed: You are not
allowed to create a Flow board at [[:$1]].,
- flow-special-enableflow-non-existent-requires-description: To create
a Flow board where no page currently exists, you must provide a description.,
flow-special-enableflow-page-is-liquidthreads: There is a
LiquidThreads page at [[:$1]].,
flow-special-enableflow-confirmation: You have successfully created
a Flow board at [[$1]].,
flow-conversion-archive-page-name-format: %s/Archive
%d\n%s/Archive%d\n%s/archive %d\n%s/archive%d,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 802a00c..6bcd486 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -140,7 +140,7 @@
flow-error-lock-moderated-post: Used as error message when user
attempts to resolve (lock) a moderated topic/post.,
flow-error-external-multi: Used as error message. Parameters:\n* $1
- list of error messages\nSee also:\n* {{msg-mw|Flow-error-external}},
flow-error-missing-content: Used as error
message.\n{{Related|Flow-error-missing}},
- flow-error-missing-summary: Used as error
message.\n{{Related|Flow-error-missing}},
+ flow-error-missing-summary: Used as error message when a summary is
expected, but is not submitted. Zero-length summaries are
allowed.\n{{Related|Flow-error-missing}},
flow-error-missing-title: Used as error
message.\n{{Related|Flow-error-missing}},
flow-error-parsoid-failure: Used as error message.\n\nParsoid is a
bidirectional wikitext parser and runtime. Converts back and forth between
wikitext and HTML/XML DOM with RDFa. See [[mw:Parsoid]].,
flow-error-missing-replyto: Used as error message.\n\nThe variable
name \replyTo\ is invisible to users, so \replyTo\ can be translated.,
@@ -167,7 +167,7 @@
flow-error-title-too-long: Used as error message when a user submits
a topic title that is too long to save.\n\nParameters:\n* $1 - The number of
bytes allowed,
flow-error-no-existing-workflow: Error message when an edit to a
non-existing topic is performed.,
flow-error-not-a-post: Error message when a topic title is attempted
to be saved as post (most likely a code issue - shouldn't happen).,
- flow-error-missing-header-content: Error message when the
description is submitted without
[MediaWiki-commits] [Gerrit] WIP optional address fields for mustache - change (mediawiki...DonationInterface)
Cdentinger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234579
Change subject: WIP optional address fields for mustache
..
WIP optional address fields for mustache
This is a very basic example of my approach. l10n seems like it will be
the biggest challenge, determining what fields to show where and how to
map them in the DB. Wondering if we already have an example of that in
RapidHTML?
Change-Id: Ie22af578ad5190c350a02fa0a649e877f8331aef
---
M gateway_forms/mustache/personal_info.html.mustache
M worldpay_gateway/worldpay.adapter.php
2 files changed, 27 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/79/234579/1
diff --git a/gateway_forms/mustache/personal_info.html.mustache
b/gateway_forms/mustache/personal_info.html.mustache
index 4622774..184c39f 100644
--- a/gateway_forms/mustache/personal_info.html.mustache
+++ b/gateway_forms/mustache/personal_info.html.mustache
@@ -8,6 +8,18 @@
input
class=fullwidth name=email value={{ email }} type=email title={{ l10n
donate_interface-donor-email }} placeholder={{ l10n
donate_interface-donor-email }} id=email required
/td
/tr
+{{# address_required }}
+ tr
+ td
+ input
class=fullwidth name=street value={{ street }} type=text title={{ l10n
donate_interface-donor-street }} placeholder={{ l10n
donate_interface-donor-street }} id=street required
+ /td
+ /tr
+ tr
+ td
+ input
class=halfwidth name=city value={{ city }} type=text placeholder={{
l10n donate_interface-donor-city }} id=city requiredinput
class=halfwidth name=state value={{ state }} type=text placeholder={{
l10n donate_interface-donor-state }} id=state required
+ /td
+ /tr
+{{/ address_required }}
{{# fiscal_number_required }}
tr
td
diff --git a/worldpay_gateway/worldpay.adapter.php
b/worldpay_gateway/worldpay.adapter.php
index 84481d1..927f270 100644
--- a/worldpay_gateway/worldpay.adapter.php
+++ b/worldpay_gateway/worldpay.adapter.php
@@ -182,6 +182,13 @@
parent::__construct( $options );
}
+ public function getFormClass() {
+ if ( $this-dataObj-getVal_Escaped( 'ffname' ) === 'wp-if' ) {
+ return 'Gateway_Form_Mustache';
+ }
+ return parent::getFormClass();
+ }
+
public function getCommunicationType() {
return 'xml';
}
@@ -951,6 +958,14 @@
return 'StringIn=' . str_replace( \n, '', $xml );
}
+ public function getRequiredFields() {
+ $fields = parent::getRequiredFields();
+ if ( $this-dataObj-getVal_Escaped( 'ffname' ) === 'wp-if' ) {
+ $fields[] = 'address';
+ }
+ return $fields;
+ }
+
// override the charset from the parent function
protected function getTransactionSpecificValue( $gateway_field_name,
$token = false ) {
$original = parent::getTransactionSpecificValue(
$gateway_field_name, $token );
--
To view, visit https://gerrit.wikimedia.org/r/234579
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie22af578ad5190c350a02fa0a649e877f8331aef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Cdentinger cdentin...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Query the puppetmaster from hiera instead of $::serverip - change (operations/puppet)
Muehlenhoff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234578
Change subject: Query the puppetmaster from hiera instead of $::serverip
..
Query the puppetmaster from hiera instead of $::serverip
On strontium the $::serverip resolved to strontium's IP address instead of
the IP address of palladium, which made the ferm rule rather ineffective.
Change-Id: I0fe4a0bb283c0d139b23f59ae88bbe4e726253ea
---
M manifests/role/puppetmaster.pp
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/78/234578/1
diff --git a/manifests/role/puppetmaster.pp b/manifests/role/puppetmaster.pp
index 8862957..5686f2e 100644
--- a/manifests/role/puppetmaster.pp
+++ b/manifests/role/puppetmaster.pp
@@ -61,10 +61,11 @@
port = 8141,
}
+$puppetmaster_hostname = hiera('puppetmaster')
ferm::service { 'ssh_puppet_merge':
proto = 'tcp',
port = '22',
-srange = $::serverip,
+srange = @resolve($puppetmaster_hostname)
}
}
--
To view, visit https://gerrit.wikimedia.org/r/234578
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0fe4a0bb283c0d139b23f59ae88bbe4e726253ea
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff mmuhlenh...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Create MediawikiSearchEntities api module - change (mediawiki...Wikibase)
Bene has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234560
Change subject: Create MediawikiSearchEntities api module
..
Create MediawikiSearchEntities api module
This api module imitates the api request used eg. by MobileFrontend
to find search suggestions. The results are similar to SearchEntities
but one cannot pass a language to the api but all languages are
considered. Furthermore, the title is set to the matching term so
that something meaningful is displayed instead of the plain id.
Bug: T85368
Change-Id: Ice0a97600b92cba6b31bc27b28cb57b9ca070ad0
---
M lib/includes/store/sql/TermSqlIndex.php
M repo/Wikibase.php
A repo/includes/api/EntitySearchHelper.php
A repo/includes/api/MediawikiSearchEntities.php
M repo/includes/api/SearchEntities.php
5 files changed, 434 insertions(+), 207 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/60/234560/1
diff --git a/lib/includes/store/sql/TermSqlIndex.php
b/lib/includes/store/sql/TermSqlIndex.php
index 1f5c791..7fc4b72 100644
--- a/lib/includes/store/sql/TermSqlIndex.php
+++ b/lib/includes/store/sql/TermSqlIndex.php
@@ -690,7 +690,7 @@
$language = $term-getLanguage();
- if ( $language !== null ) {
+ if ( $language !== '' ) {
$conditions['term_language'] = $language;
}
diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index 2dca3a8..864bc7c 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -171,6 +171,7 @@
$wgAPIModules['wbsetlabel'] = 'Wikibase\Repo\Api\SetLabel';
$wgAPIModules['wbsetdescription'] = 'Wikibase\Repo\Api\SetDescription';
$wgAPIModules['wbsearchentities'] = 'Wikibase\Repo\Api\SearchEntities';
+ $wgAPIModules['wbmwsearchentities'] =
'Wikibase\Repo\Api\MediawikiSearchEntities';
$wgAPIModules['wbsetaliases'] = 'Wikibase\Repo\Api\SetAliases';
$wgAPIModules['wbeditentity'] = 'Wikibase\Repo\Api\EditEntity';
$wgAPIModules['wblinktitles'] = 'Wikibase\Repo\Api\LinkTitles';
diff --git a/repo/includes/api/EntitySearchHelper.php
b/repo/includes/api/EntitySearchHelper.php
new file mode 100644
index 000..5bf0450
--- /dev/null
+++ b/repo/includes/api/EntitySearchHelper.php
@@ -0,0 +1,224 @@
+?php
+
+
+namespace Wikibase\Repo\Api;
+
+use OutOfBoundsException;
+use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Services\EntityId\EntityIdParser;
+use Wikibase\DataModel\Services\EntityId\EntityIdParsingException;
+use Wikibase\DataModel\Services\Lookup\LabelDescriptionLookup;
+use Wikibase\DataModel\Term\Term;
+use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Repo\Interactors\TermIndexSearchInteractor;
+use Wikibase\Repo\Interactors\TermSearchResult;
+use Wikibase\TermIndex;
+use Wikibase\TermIndexEntry;
+
+/**
+ * Helper class to search for entities.
+ *
+ * @licence GNU GPL v2+
+ * @author Bene* benestar.wikime...@gmail.com
+ */
+class EntitySearchHelper {
+
+ /**
+* @var EntityTitleLookup
+*/
+ private $titleLookup;
+
+ /**
+* @var EntityIdParser
+*/
+ private $idParser;
+
+ /**
+* @var TermIndexSearchInteractor
+*/
+ private $termIndexSearchInteractor;
+
+ /**
+* @var TermIndex
+*/
+ private $termIndex;
+
+ /**
+* @var LabelDescriptionLookup
+*/
+ private $labelDescriptionLookup;
+
+ public function __construct(
+ EntityTitleLookup $titleLookup,
+ EntityIdParser $idParser,
+ TermIndexSearchInteractor $termIndexSearchInteractor,
+ TermIndex $termIndex,
+ LabelDescriptionLookup $labelDescriptionLookup
+ ) {
+ $this-titleLookup = $titleLookup;
+ $this-idParser = $idParser;
+ $this-termIndexSearchInteractor = $termIndexSearchInteractor;
+ $this-termIndex = $termIndex;
+ $this-labelDescriptionLookup = $labelDescriptionLookup;
+ }
+
+ /**
+* Gets exact matches. If there are not enough exact matches, it gets
prefixed matches.
+*
+* @param string $text
+* @param string $entityType
+* @param string $languageCode
+* @param int $limit
+* @param bool $strictLanguage
+*
+* @return TermSearchResult[] Key: string Serialized EntityId
+*/
+ public function getRankedSearchResults( $text, $entityType,
$languageCode, $limit, $strictLanguage ) {
+ $allSearchResults = array();
+
+ // If $text is the ID of an existing item, include it in the
result.
+ $entityId = $this-getExactMatchForEntityId( $text, $entityType
);
+ if ( $entityId !== null ) {
+ // This is nothing to do with terms, but make it
[MediaWiki-commits] [Gerrit] Update `repository` link in `package.json` - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Update `repository` link in `package.json`
..
Update `repository` link in `package.json`
Although we prefer gerrit for code submissions, using the github URL
here is probably more useful.
Change-Id: Icc65d2bc28b09a890dfa0c8bc3ff162c0b0afb11
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/package.json b/package.json
index a12ec4d..88b7433 100644
--- a/package.json
+++ b/package.json
@@ -60,6 +60,6 @@
},
repository: {
type: git,
-url: https://gerrit.wikimedia.org/r/p/mediawiki/services/parsoid;
+url: https://github.com/wikimedia/parsoid.git;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/234555
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icc65d2bc28b09a890dfa0c8bc3ff162c0b0afb11
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott canan...@wikimedia.org
Gerrit-Reviewer: Arlolra abrea...@wikimedia.org
Gerrit-Reviewer: Cscott canan...@wikimedia.org
Gerrit-Reviewer: Subramanya Sastry ssas...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow trailing punctuation for typed ISBN/PMID/RFC autolinks - change (mediawiki...VisualEditor)
Cscott has uploaded a new change for review. https://gerrit.wikimedia.org/r/234566 Change subject: Allow trailing punctuation for typed ISBN/PMID/RFC autolinks .. Allow trailing punctuation for typed ISBN/PMID/RFC autolinks Bug: T110690 Change-Id: I7d3b550588a75b08b1a587705f02a86ab7c5806c --- M modules/ve-mw/ui/actions/ve.ui.MWLinkAction.js 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/66/234566/1 diff --git a/modules/ve-mw/ui/actions/ve.ui.MWLinkAction.js b/modules/ve-mw/ui/actions/ve.ui.MWLinkAction.js index a9f44de..4d789ec 100644 --- a/modules/ve-mw/ui/actions/ve.ui.MWLinkAction.js +++ b/modules/ve-mw/ui/actions/ve.ui.MWLinkAction.js @@ -92,7 +92,8 @@ }; /** - * Autolink the selected RFC/PMID/ISBN, which may have trailing whitespace. + * Autolink the selected RFC/PMID/ISBN, which may have trailing punctuation + * followed by whitespace. * * @see ve.ui.LinkAction#autolinkUrl * @method @@ -143,5 +144,7 @@ ve.ui.sequenceRegistry.register( // This regexp doesn't have to be precise; we'll validate the magic // link in #autolinkMagicLink above. - new ve.ui.Sequence( 'autolinkMagicLink', 'autolinkMagicLink', /\b(RFC|PMID|ISBN)\s+[0-9]([- 0-9]*[0-9Xx])?(\s|\n\n)$/, 0, true ) + // The trailing \S* covers any trailing punctuation, which will be + // stripped before validating the link. + new ve.ui.Sequence( 'autolinkMagicLink', 'autolinkMagicLink', /\b(RFC|PMID|ISBN)\s+[0-9]([- 0-9]*[0-9Xx])?\S*(\s|\n\n)$/, 0, true ) ); -- To view, visit https://gerrit.wikimedia.org/r/234566 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7d3b550588a75b08b1a587705f02a86ab7c5806c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Cscott canan...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix button config for campaigns to check for a given object ... - change (mediawiki...UploadWizard)
Kai Nissen (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234567
Change subject: Fix button config for campaigns to check for a given object
reference
..
Fix button config for campaigns to check for a given object reference
This fixes the issue that occurs, when the campaign definition sets a
custom target for one of the buttons on the Thanks page and no actual
objref is given in the query string.
Bug: T110697
Change-Id: I107def03c501eb81f0e671bf41c3e972e78e0e9f
---
M includes/UploadWizardCampaign.php
M resources/ui/uw.ui.Thanks.js
2 files changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/67/234567/1
diff --git a/includes/UploadWizardCampaign.php
b/includes/UploadWizardCampaign.php
index feff16b..cdd7938 100755
--- a/includes/UploadWizardCampaign.php
+++ b/includes/UploadWizardCampaign.php
@@ -466,6 +466,8 @@
$validUrl =
$this-getButtonHrefByObjectReference( $objRef );
if ( $validUrl ) {
$this-parsedConfig['display'][$button]['target'] = $validUrl;
+ } else {
+ unset(
$this-parsedConfig['display'][$button] );
}
}
}
diff --git a/resources/ui/uw.ui.Thanks.js b/resources/ui/uw.ui.Thanks.js
index 6e82225..956857c 100644
--- a/resources/ui/uw.ui.Thanks.js
+++ b/resources/ui/uw.ui.Thanks.js
@@ -37,7 +37,7 @@
$( '#mwe-upwiz-step-thanks' )
);
- if ( mw.UploadWizard.config.defaults
mw.UploadWizard.config.defaults.objref !== '' ) {
+ if ( this.isObjectReferenceGiven() ) {
this.getDelayNotice().prependTo( this.$div );
}
@@ -70,7 +70,7 @@
// TODO: make the step order configurable by campaign
definitions instead of using these hacks
beginButtonTarget = this.getButtonConfig( 'beginButton',
'target' );
- if ( !beginButtonTarget ) {
+ if ( !beginButtonTarget || ( beginButtonTarget === 'dropObjref'
!this.isObjectReferenceGiven() ) ) {
this.beginButton.on( 'click', function () {
thanks.emit( 'next-step' );
} );
@@ -219,5 +219,9 @@
return $delayNotice;
};
+ TP.isObjectReferenceGiven = function () {
+ return mw.UploadWizard.config.defaults
mw.UploadWizard.config.defaults.objref !== '';
+ };
+
ui.Thanks = Thanks;
}( mediaWiki, jQuery, mediaWiki.uploadWizard.ui, OO ) );
--
To view, visit https://gerrit.wikimedia.org/r/234567
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I107def03c501eb81f0e671bf41c3e972e78e0e9f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Kai Nissen (WMDE) kai.nis...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improve form submission on Special:CreateNewsletter - change (mediawiki...Newsletter)
Glaisher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234568
Change subject: Improve form submission on Special:CreateNewsletter
..
Improve form submission on Special:CreateNewsletter
* Add more validation
* Minor code style changes
* Maximum length for name and description field added
Change-Id: I60ee65b5be66eae4ddce481ea7aa7de0c32c232b
---
M i18n/en.json
M includes/specials/SpecialNewsletterCreate.php
2 files changed, 47 insertions(+), 58 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter
refs/changes/68/234568/1
diff --git a/i18n/en.json b/i18n/en.json
index 68d316a..83e4eee 100755
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -21,13 +21,13 @@
newsletter-unconfirmed-email-error: The provided username does not
have a confirmed email address!,
newsletter-required-fields-error: Required fields are empty,
newsletter-exist-error: A newsletter with the same name already
exists. Try again with another name,
- newsletter-mainpage-not-found-error: The Newsletter main page cannot
be found. Please try again,
+ newsletter-mainpage-not-found-error: Newsletter main page does not
exist. Please try again.,
newsletter-announceissueform-announceissue-section: Announce new
issue,
newsletter-announceissueform-addpublisher-section: Add publishers,
newsletter-create-section: Create newsletter,
newsletter-create-submit: Create newsletter,
newsletter-create-confirmation: A new newsletter has been
successfully created. You can manage newsletters through
[[Special:ManageNewsletter]].,
- newsletter-create-mainpage-error: Unknown Newsletter main page
entered. Please try again,
+ newsletter-create-mainpage-error: Invalid characters Newsletter main
page entered. Please try again,
newsletter-issue-announce-confirmation: Good job! You just announced
a new issue of your newsletter.,
newsletter-subtitlelinks-list: List of newsletters,
newsletter-subtitlelinks-create: Create a new newsletter,
diff --git a/includes/specials/SpecialNewsletterCreate.php
b/includes/specials/SpecialNewsletterCreate.php
index 94700c7..192636c 100644
--- a/includes/specials/SpecialNewsletterCreate.php
+++ b/includes/specials/SpecialNewsletterCreate.php
@@ -28,8 +28,6 @@
}
/**
-* Function to generate Create Newsletter Form
-*
* @return array
*/
protected function getFormFields() {
@@ -38,6 +36,7 @@
'type' = 'text',
'required' = true,
'label-message' = 'newsletter-name',
+ 'maxlength' = 50
),
'description' = array(
'type' = 'textarea',
@@ -45,6 +44,7 @@
'label-message' = 'newsletter-desc',
'rows' = 15,
'cols' = 50,
+ 'maxlength' = 767
),
'mainpage' = array(
'required' = true,
@@ -62,78 +62,67 @@
),
'size' = 18, # size of 'other' field
'maxlength' = 50,
- ),
- // @todo FIXME: this shouldn't be a form field
- 'publisher' = array(
- 'type' = 'hidden',
- 'default' = $this-getUser()-getId(),
- ),
+ )
);
}
/**
-* Perform insert query on newsletter table with data retrieved from
HTML
-* form for creating newsletters
+* Do input validation, error handling and create a new newletter.
*
-* @param array $formData The data entered by user in the form
-*
+* @param array $data The data entered by user in the form
* @return bool|array true on success, array on error
*/
- public function onSubmit( array $formData ) {
- if ( isset( $formData['mainpage'] ) ) {
- $page = Title::newFromText( $formData['mainpage'] );
- $pageId = $page-getArticleId();
- } else {
- return array( 'newsletter-create-mainpage-error' );
- }
- if ( isset( $formData['name'] )
- isset( $formData['description'] )
- ( $pageId !== 0 )
- isset( $formData['mainpage'] )
- isset( $formData['frequency'] )
- isset( $formData['publisher'] )
- ) {
- //
[MediaWiki-commits] [Gerrit] Set log levels for pykafka and kazoo to info - change (mediawiki...EventLogging)
Ottomata has submitted this change and it was merged. Change subject: Set log levels for pykafka and kazoo to info .. Set log levels for pykafka and kazoo to info Change-Id: I91db93f1e85ec635dc474957a43126c93cb14968 --- M server/eventlogging/utils.py 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Ottomata: Looks good to me, approved diff --git a/server/eventlogging/utils.py b/server/eventlogging/utils.py index d4b6e93..a12e5c9 100644 --- a/server/eventlogging/utils.py +++ b/server/eventlogging/utils.py @@ -196,5 +196,7 @@ logging.basicConfig(stream=sys.stderr, level=eventlogging_log_level, format='%(asctime)s (%(threadName)-10s) %(message)s') -# Set kafka module logging level to INFO, DEBUG is too noisy. +# Set module logging level to INFO, DEBUG is too noisy. logging.getLogger(kafka).setLevel(logging.INFO) +logging.getLogger(pykafka).setLevel(logging.INFO) +logging.getLogger(kazoo).setLevel(logging.INFO) -- To view, visit https://gerrit.wikimedia.org/r/234541 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I91db93f1e85ec635dc474957a43126c93cb14968 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/EventLogging Gerrit-Branch: master Gerrit-Owner: Ottomata o...@wikimedia.org Gerrit-Reviewer: Madhuvishy mviswanat...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Ottomata o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add --useBatchAPI CLI arg to parse.js - change (mediawiki...parsoid)
Subramanya Sastry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234572
Change subject: Add --useBatchAPI CLI arg to parse.js
..
Add --useBatchAPI CLI arg to parse.js
Change-Id: I33eb2d0f7e092152774b2d350f9cef04633e54d0
---
M lib/mediawiki.Util.js
M tests/parse.js
2 files changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/72/234572/1
diff --git a/lib/mediawiki.Util.js b/lib/mediawiki.Util.js
index 07ea4f7..da2e59b 100644
--- a/lib/mediawiki.Util.js
+++ b/lib/mediawiki.Util.js
@@ -222,6 +222,9 @@
parsoidConfig.linting = true;
parsoidConfig.linterAPI = null;
}
+ if (opts.useBatchAPI !== undefined) {
+ parsoidConfig.useBatchAPI = opts.useBatchAPI;
+ }
return parsoidConfig;
},
diff --git a/tests/parse.js b/tests/parse.js
index a0a22f6..c0ebe64 100755
--- a/tests/parse.js
+++ b/tests/parse.js
@@ -125,6 +125,11 @@
'boolean': true,
'default': false,
},
+ 'useBatchAPI': {
+ description: 'Turn on/off the API batching system',
+ 'boolean': true,
+ 'default': false,
+ },
});
exports.defaultOptions = yargs.options(standardOpts).parse([]);
--
To view, visit https://gerrit.wikimedia.org/r/234572
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I33eb2d0f7e092152774b2d350f9cef04633e54d0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Anchor the regex for ./ stripping - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Anchor the regex for ./ stripping
..
Anchor the regex for ./ stripping
So it doesn't strip ./ or ../ out of the middle of page names.
Apparently it's common to have user names on hewiki end with dots,
so their user subpages end up being of the form [[User:Foo./Bar]].
This unanchored regex corrupted links to those pages.
Bug: T110676
Change-Id: I0cb3e47afd2b3d0d9d953f6650f5858f9bdb58e9
---
M includes/Parsoid/Utils.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Mooeypoo: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Parsoid/Utils.php b/includes/Parsoid/Utils.php
index b4299c6..475a34a 100644
--- a/includes/Parsoid/Utils.php
+++ b/includes/Parsoid/Utils.php
@@ -303,7 +303,7 @@
// currently parsoid always uses enough ../ or ./ to go
// back to the root, a bit of a kludge but just assume we
// can strip and will end up with a non-relative text.
- $text = preg_replace( '|(\.\.?/)+|', '', $text );
+ $text = preg_replace( '|^(\.\.?/)+|', '', $text );
if ( $text ( $text[0] === '/' || $text[0] === '#' ) ) {
return Title::newFromText( $title-getDBkey() . $text,
$title-getNamespace() );
--
To view, visit https://gerrit.wikimedia.org/r/234571
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0cb3e47afd2b3d0d9d953f6650f5858f9bdb58e9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Mooeypoo mor...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Anchor the regex for ./ stripping - change (mediawiki...Flow)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234574
Change subject: Anchor the regex for ./ stripping
..
Anchor the regex for ./ stripping
So it doesn't strip ./ or ../ out of the middle of page names.
Apparently it's common to have user names on hewiki end with dots,
so their user subpages end up being of the form [[User:Foo./Bar]].
This unanchored regex corrupted links to those pages.
Bug: T110676
Change-Id: I0cb3e47afd2b3d0d9d953f6650f5858f9bdb58e9
(cherry picked from commit dc10381d1fe3506112bbabf374761291afe957d6)
---
M includes/Parsoid/Utils.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/74/234574/1
diff --git a/includes/Parsoid/Utils.php b/includes/Parsoid/Utils.php
index b4299c6..475a34a 100644
--- a/includes/Parsoid/Utils.php
+++ b/includes/Parsoid/Utils.php
@@ -303,7 +303,7 @@
// currently parsoid always uses enough ../ or ./ to go
// back to the root, a bit of a kludge but just assume we
// can strip and will end up with a non-relative text.
- $text = preg_replace( '|(\.\.?/)+|', '', $text );
+ $text = preg_replace( '|^(\.\.?/)+|', '', $text );
if ( $text ( $text[0] === '/' || $text[0] === '#' ) ) {
return Title::newFromText( $title-getDBkey() . $text,
$title-getNamespace() );
--
To view, visit https://gerrit.wikimedia.org/r/234574
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cb3e47afd2b3d0d9d953f6650f5858f9bdb58e9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: wmf/1.26wmf20
Gerrit-Owner: Catrope roan.katt...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Exclude the arbitration committee wikis from the pageviews c... - change (analytics...source)
Joal has submitted this change and it was merged. Change subject: Exclude the arbitration committee wikis from the pageviews counts .. Exclude the arbitration committee wikis from the pageviews counts Arbcom maintains various private wikis that are currently included in the pageviews definition - they shouldn't be given an API is being built and those page titles contain sensitive information. This patch excludes arbcom's wikis - a separate task at https://phabricator.wikimedia.org/T110701 removes the existing data. Change-Id: I2094d91e70c71267a5cb706ead34078d4d4356df --- M refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/PageviewDefinition.java M refinery-core/src/test/resources/pageview_test_data.csv 2 files changed, 12 insertions(+), 11 deletions(-) Approvals: Joal: Verified; Looks good to me, approved diff --git a/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/PageviewDefinition.java b/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/PageviewDefinition.java index b065550..63f6bb9 100644 --- a/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/PageviewDefinition.java +++ b/refinery-core/src/main/java/org/wikimedia/analytics/refinery/core/PageviewDefinition.java @@ -54,8 +54,8 @@ ); private final Pattern uriHostProjectDomainPattern = Pattern.compile( -^((?!www)(?!test)(?!donate)([a-zA-Z0-9-_]+)\\.)* // not starting with www. or test -+ (wik(ibooks| // match project domains ending in .org +^((?!www)(?!test)(?!donate)(?!arbcom)([a-zA-Z0-9-_]+)\\.)* // not starting with www test, donate or arbcom ++ (wik(ibooks|// match project domains ending in .org + inews|ipedia|iquote|isource|tionary|iversity|ivoyage))\\.org$ ); @@ -63,7 +63,7 @@ private final Pattern uriHostOtherProjectsPattern = Pattern.compile( ^((?!test)([a-zA-Z0-9-_]+)\\.)* // not starting with test -+ (wikidata|mediawiki|wikimediafoundation)\\.org$ // match project domains ending in .org ++ (wikidata|mediawiki|wikimediafoundation)\\.org$ // match project domains ending in .org ); private final Pattern uriPathPattern = Pattern.compile( diff --git a/refinery-core/src/test/resources/pageview_test_data.csv b/refinery-core/src/test/resources/pageview_test_data.csv index 9565be4..646f155 100644 --- a/refinery-core/src/test/resources/pageview_test_data.csv +++ b/refinery-core/src/test/resources/pageview_test_data.csv @@ -1,9 +1,9 @@ test_description,project,dialect,page_title,is_pageview,is_legacy_pageview,is_app_pageview,ip_address,x_forwarded_for,uri_host,uri_path,uri_query,http_status,content_type,user_agent Is Pageview - Desktop,en.wikipedia,default,Horseshoe_crab,true,true,false,174.62.175.82,-,en.wikipedia.org, /wiki/Horseshoe%20crab#anchor,-,200,text/html, turnip/ Is Pageview – Desktop – locally cached content,en.wikipedia,default,Horseshoe/crab,true,true,false,174.62.175.82,-,en.wikipedia.org,/wiki/Horseshoe/crab,-,304,text/html, turnip -Is Pageview – App - Android,en.wikipedia,-,Hachiko_–_Eine_wunderbare_Freundschaft,true,false,true,174.62.175.83,-,en.wikipedia.org,/w/api.php,action=mobileviewformat=jsonpage=Hachiko_–_Eine_wunderbare_Freundschaftprop=textsections=0,200, application/json,WikipediaApp/2.0-r-2015-01-15 (Android 4.4.2; Phone) Google Play -is Pageview – App – iOS – old version,en.wikipedia,-,Hachiko_–_Eine_wunderbare_Freundschaft,true,false,true,174.62.175.83,-,en.wikipedia.org, /w/api.php,action=mobileviewformat=jsonpage=Hachiko_–_Eine_wunderbare_Freundschaftprop=textsections=0,200, application/json,WikipediaApp/4.0.6 (iPhone OS 8.2; Phone) -Is Pageview – App - iOS – new version,en.wikipedia,-,Hachiko_–_Eine_wunderbare_Freundschaft,true,false,true,174.62.175.83,-,en.wikipedia.org, /w/api.php,?action=mobileviewformat=jsonpage=Hachiko_–_Eine_wunderbare_Freundschaftprop=textsections=all,200, application/json,WikipediaApp/4.0.6 (iPhone OS 8.2; Phone) +Is Pageview – App - Android,en.wikipedia,-,Hachiko_–_Eine_wunderbare_Freundschaft,true,false,true,174.62.175.83,-,en.wikipedia.org,/w/api.php,action=mobileviewformat=jsonpage=Hachiko_–_Eine_wunderbare_Freundschaftprop=textsections=0,200, application/json,WikipediaApp/2.0-r-2015-01-15 (Android 4.4.2 Phone) Google Play +is Pageview – App – iOS – old version,en.wikipedia,-,Hachiko_–_Eine_wunderbare_Freundschaft,true,false,true,174.62.175.83,-,en.wikipedia.org, /w/api.php,action=mobileviewformat=jsonpage=Hachiko_–_Eine_wunderbare_Freundschaftprop=textsections=0,200, application/json,WikipediaApp/4.0.6 (iPhone OS 8.2 Phone) +Is Pageview – App - iOS – new
[MediaWiki-commits] [Gerrit] Be a little more conservative with the IPv6 support in the S... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Be a little more conservative with the IPv6 support in the
Sanitizer.
..
Be a little more conservative with the IPv6 support in the Sanitizer.
This isn't strictly necessary, but it matches the production used in
Parsoid better.
Change-Id: I542b1f71fe9e917fef5718a6df8ebb98735f7fb4
---
M includes/Sanitizer.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index fbf3234..c02bdc9 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -1809,7 +1809,7 @@
$host = preg_replace( $strip, '', $host );
// IPv6 host names are bracketed with []. Url-decode
these.
- if ( substr_compare( //%5B, $host, 0, 5 ) === 0
preg_match( '!^//%5B(.*?)%5D((:\d+)?)$!', $host, $matches ) ) {
+ if ( substr_compare( //%5B, $host, 0, 5 ) === 0
preg_match( '!^//%5B([0-9A-Fa-f:.]+)%5D((:\d+)?)$!', $host, $matches ) ) {
$host = '//[' . $matches[1] . ']' . $matches[2];
}
--
To view, visit https://gerrit.wikimedia.org/r/234536
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I542b1f71fe9e917fef5718a6df8ebb98735f7fb4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Cscott canan...@wikimedia.org
Gerrit-Reviewer: Arlolra abrea...@wikimedia.org
Gerrit-Reviewer: Jackmcbarn jackmcb...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable ferm on the puppetmaster backends - change (operations/puppet)
Muehlenhoff has submitted this change and it was merged.
Change subject: Disable ferm on the puppetmaster backends
..
Disable ferm on the puppetmaster backends
Still problems with the puppet merges, let's sort this out properly
after the weekend
Change-Id: Idef515cd2ad4a3bb19cf1e7922041f5411dfac0e
---
M manifests/role/puppetmaster.pp
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
Muehlenhoff: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/puppetmaster.pp b/manifests/role/puppetmaster.pp
index 482d5a9..8862957 100644
--- a/manifests/role/puppetmaster.pp
+++ b/manifests/role/puppetmaster.pp
@@ -36,7 +36,6 @@
class role::puppetmaster::backend {
include passwords::puppet::database
-include base::firewall
system::role { 'puppetmaster':
description = 'Puppetmaster backend'
--
To view, visit https://gerrit.wikimedia.org/r/234564
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idef515cd2ad4a3bb19cf1e7922041f5411dfac0e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff mmuhlenh...@wikimedia.org
Gerrit-Reviewer: Muehlenhoff mmuhlenh...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
