date:20170508

[MediaWiki-commits] [Gerrit] oojs/ui[master]: [DEPRECATING CHANGE] icons: Deprecate 'bookmark' icon

2017-05-08 Thread VolkerE (Code Review)

VolkerE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352745 )

Change subject: [DEPRECATING CHANGE] icons: Deprecate 'bookmark' icon
..

[DEPRECATING CHANGE] icons: Deprecate 'bookmark' icon

Change-Id: I1aee896a33f1070139687f8170b6db9ed87e79e4
---
M demos/pages/icons.js
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/45/352745/1

diff --git a/demos/pages/icons.js b/demos/pages/icons.js
index ca1bb29..d718f7f 100644
--- a/demos/pages/icons.js
+++ b/demos/pages/icons.js
@@ -51,7 +51,6 @@
interactions: [
'add',
'advanced',
-   'bookmark',
'browser',
'cancel',
'check',

-- 
To view, visit https://gerrit.wikimedia.org/r/352745
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1aee896a33f1070139687f8170b6db9ed87e79e4
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Avoid DB master use on GET in SpecialExportTranslations

2017-05-08 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352744 )

Change subject: Avoid DB master use on GET in SpecialExportTranslations
..

Avoid DB master use on GET in SpecialExportTranslations

Change-Id: I50fd9f8cfd2313d076e66e5ec51073aa0c8e2030
---
M messagegroups/WikiPageMessageGroup.php
1 file changed, 11 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/44/352744/1

diff --git a/messagegroups/WikiPageMessageGroup.php 
b/messagegroups/WikiPageMessageGroup.php
index d36d80f..a415275 100644
--- a/messagegroups/WikiPageMessageGroup.php
+++ b/messagegroups/WikiPageMessageGroup.php
@@ -12,7 +12,7 @@
  * Wraps the translatable page sections into a message group.
  * @ingroup PageTranslation MessageGroup
  */
-class WikiPageMessageGroup extends WikiMessageGroup {
+class WikiPageMessageGroup extends WikiMessageGroup implements IDBAccessObject 
{
/**
 * @var Title|string
 */
@@ -108,9 +108,10 @@
 *
 * @param string $key Message key
 * @param string $code Language code
+* @param integer $flags READ_* class constant bitfield
 * @return string|null Stored translation or null.
 */
-   public function getMessage( $key, $code ) {
+   public function getMessage( $key, $code, $flags = 0 ) {
if ( $this->isSourceLanguage( $code ) ) {
$stuff = $this->load( $code );
 
@@ -123,10 +124,14 @@
}
 
$title = Title::makeTitleSafe( $this->getNamespace(), 
"$key/$code" );
-   $flags = PageTranslationHooks::$renderingContext
-   ? Revision::READ_NORMAL // bug T95753
-   : Revision::READ_LATEST;
-   $rev = Revision::newFromTitle( $title, false, $flags );
+   if ( PageTranslationHooks::$renderingContext ) {
+   $revFlags = Revision::READ_NORMAL; // bug T95753
+   } else {
+   $revFlags = ( $flags & self::READ_LATEST ) == 
self::READ_LATEST
+   ? Revision::READ_LATEST
+   : Revision::READ_NORMAL;
+   }
+   $rev = Revision::newFromTitle( $title, false, $revFlags );
 
if ( !$rev ) {
return null;

-- 
To view, visit https://gerrit.wikimedia.org/r/352744
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I50fd9f8cfd2313d076e66e5ec51073aa0c8e2030
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: Log hack to mysqli driver.

2017-05-08 Thread Eileen (Code Review)

Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352743 )

Change subject: Log hack to mysqli driver.
..

Log hack to mysqli driver.

Hopefully this will work now without all the class_api calls

Change-Id: Ied8a844ab26f348517021882a30b37babeeb557a
---
M packages/DB/mysqli.php
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm 
refs/changes/43/352743/1

diff --git a/packages/DB/mysqli.php b/packages/DB/mysqli.php
index 371cfb0..fab72ad 100644
--- a/packages/DB/mysqli.php
+++ b/packages/DB/mysqli.php
@@ -498,7 +498,11 @@
  */
 function freeResult($result)
 {
-  return is_resource($result) ? mysqli_free_result($result) : false;
+   if (!$result instanceof mysqli_result) {
+return false;
+}
+mysqli_free_result($result);
+return true;
 }
 
 // }}}

-- 
To view, visit https://gerrit.wikimedia.org/r/352743
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied8a844ab26f348517021882a30b37babeeb557a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: comment out contacts-new.cfg

2017-05-08 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352742 )

Change subject: icinga: comment out contacts-new.cfg
..


icinga: comment out contacts-new.cfg

still not working. commenting out to debug more later and
fix puppet run on tegmen.

Change-Id: I7b7a488186f83c780d8e52013eb018c848314dc8
---
M modules/nagios_common/manifests/contacts.pp
1 file changed, 7 insertions(+), 7 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/nagios_common/manifests/contacts.pp 
b/modules/nagios_common/manifests/contacts.pp
index be4a235..2402f83 100644
--- a/modules/nagios_common/manifests/contacts.pp
+++ b/modules/nagios_common/manifests/contacts.pp
@@ -62,12 +62,12 @@
 
 # This 'new' file exists only temp during careful transition of 
contacts
 # from private repo and is not actually included by Icinga. --dz 
20170505
-file { "${config_dir}/contacts-new.cfg":
-ensure  => $ensure,
-content => template('nagios_common/contacts-new.cfg.erb'),
-owner   => $owner,
-group   => $group,
-mode=> '0400',
-}
+#file { "${config_dir}/contacts-new.cfg":
+#ensure  => $ensure,
+#content => template('nagios_common/contacts-new.cfg.erb'),
+#owner   => $owner,
+#group   => $group,
+#mode=> '0400',
+#}
 }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/352742
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7b7a488186f83c780d8e52013eb018c848314dc8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: comment out contacts-new.cfg

2017-05-08 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352742 )

Change subject: icinga: comment out contacts-new.cfg
..

icinga: comment out contacts-new.cfg

still not working. commenting out to debug more later and
fix puppet run on tegmen.

Change-Id: I7b7a488186f83c780d8e52013eb018c848314dc8
---
M modules/nagios_common/manifests/contacts.pp
1 file changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/42/352742/1

diff --git a/modules/nagios_common/manifests/contacts.pp 
b/modules/nagios_common/manifests/contacts.pp
index be4a235..2402f83 100644
--- a/modules/nagios_common/manifests/contacts.pp
+++ b/modules/nagios_common/manifests/contacts.pp
@@ -62,12 +62,12 @@
 
 # This 'new' file exists only temp during careful transition of 
contacts
 # from private repo and is not actually included by Icinga. --dz 
20170505
-file { "${config_dir}/contacts-new.cfg":
-ensure  => $ensure,
-content => template('nagios_common/contacts-new.cfg.erb'),
-owner   => $owner,
-group   => $group,
-mode=> '0400',
-}
+#file { "${config_dir}/contacts-new.cfg":
+#ensure  => $ensure,
+#content => template('nagios_common/contacts-new.cfg.erb'),
+#owner   => $owner,
+#group   => $group,
+#mode=> '0400',
+#}
 }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/352742
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b7a488186f83c780d8e52013eb018c848314dc8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[wmf/1.30.0-wmf.1]: Temporarily disable use of client services in WikibaseRepo

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352741 )

Change subject: Temporarily disable use of client services in WikibaseRepo
..


Temporarily disable use of client services in WikibaseRepo

Re-applying I993298d7a1527eb320ca920ad09560004ab8c3f0 on
the deployment branch, until we have a solution in
master for T158847.

Change-Id: Ia8ea1d6d5403e14d59eaa89c5f6738d01feb5825
(cherry picked from commit 2755a3431f5a763b634c2c46d034ad34796631e0)
(cherry picked from commit fea0916063ddf80f32db45caf94ae9d742abdeaf)
(cherry picked from commit 5f502023e8b41e67488bef859f38a945a2807496)
---
M repo/includes/WikibaseRepo.php
1 file changed, 0 insertions(+), 7 deletions(-)

Approvals:
  Aude: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index d25e4d5..e13aab5 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -32,7 +32,6 @@
 use ValueFormatters\ValueFormatter;
 use Wikibase\ChangeOp\ChangeOpFactoryProvider;
 use Wikibase\Client\EntityDataRetrievalServiceFactory;
-use Wikibase\Client\WikibaseClient;
 use Wikibase\DataModel\DeserializerFactory;
 use Wikibase\DataModel\Entity\DispatchingEntityIdParser;
 use Wikibase\DataModel\Entity\EntityIdParser;
@@ -327,12 +326,6 @@
$repositoryDefinitions = 
self::getRepositoryDefinitionsFromSettings( $settings );
 
$dataRetrievalServices = null;
-
-   // If client functionality is enabled, use it to enable 
federation.
-   if ( defined( 'WBC_VERSION' ) ) {
-   $dataRetrievalServices = 
WikibaseClient::getDefaultInstance()->getEntityDataRetrievalServiceFactory();
-   $repositoryDefinitions = 
WikibaseClient::getDefaultInstance()->getRepositoryDefinitions();
-   }
 
return new self(
$settings,

-- 
To view, visit https://gerrit.wikimedia.org/r/352741
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8ea1d6d5403e14d59eaa89c5f6738d01feb5825
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.30.0-wmf.1
Gerrit-Owner: Aude 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[wmf/1.30.0-wmf.1]: Temporarily disable use of client services in WikibaseRepo

2017-05-08 Thread Aude (Code Review)

Aude has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352741 )

Change subject: Temporarily disable use of client services in WikibaseRepo
..

Temporarily disable use of client services in WikibaseRepo

Re-applying I993298d7a1527eb320ca920ad09560004ab8c3f0 on
the deployment branch, until we have a solution in
master for T158847.

Change-Id: Ia8ea1d6d5403e14d59eaa89c5f6738d01feb5825
(cherry picked from commit 2755a3431f5a763b634c2c46d034ad34796631e0)
(cherry picked from commit fea0916063ddf80f32db45caf94ae9d742abdeaf)
(cherry picked from commit 5f502023e8b41e67488bef859f38a945a2807496)
---
M repo/includes/WikibaseRepo.php
1 file changed, 0 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/41/352741/1

diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index d25e4d5..e13aab5 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -32,7 +32,6 @@
 use ValueFormatters\ValueFormatter;
 use Wikibase\ChangeOp\ChangeOpFactoryProvider;
 use Wikibase\Client\EntityDataRetrievalServiceFactory;
-use Wikibase\Client\WikibaseClient;
 use Wikibase\DataModel\DeserializerFactory;
 use Wikibase\DataModel\Entity\DispatchingEntityIdParser;
 use Wikibase\DataModel\Entity\EntityIdParser;
@@ -327,12 +326,6 @@
$repositoryDefinitions = 
self::getRepositoryDefinitionsFromSettings( $settings );
 
$dataRetrievalServices = null;
-
-   // If client functionality is enabled, use it to enable 
federation.
-   if ( defined( 'WBC_VERSION' ) ) {
-   $dataRetrievalServices = 
WikibaseClient::getDefaultInstance()->getEntityDataRetrievalServiceFactory();
-   $repositoryDefinitions = 
WikibaseClient::getDefaultInstance()->getRepositoryDefinitions();
-   }
 
return new self(
$settings,

-- 
To view, visit https://gerrit.wikimedia.org/r/352741
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8ea1d6d5403e14d59eaa89c5f6738d01feb5825
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.30.0-wmf.1
Gerrit-Owner: Aude 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[wmf/1.30.0-wmf.1]: New deployment build - wmf/1.30.0-wmf.1

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352739 )

Change subject: New deployment build - wmf/1.30.0-wmf.1
..


New deployment build - wmf/1.30.0-wmf.1

Change-Id: Ib053c6b78a5e4fde626318437ff161eb6f7a4eb9
---
M WikibaseClient.settings.php
M WikibaseRepo.settings.php
M composer.json
M composer.lock
M extensions/ArticlePlaceholder/composer.json
M extensions/ArticlePlaceholder/i18n/bn.json
M extensions/ArticlePlaceholder/i18n/hi.json
M extensions/ArticlePlaceholder/includes/AboutTopicRenderer.php
M 
extensions/ArticlePlaceholder/tests/phpunit/includes/AboutTopicRendererTest.php
M extensions/Constraints/.gitignore
M extensions/Constraints/.jshintrc
M extensions/Constraints/README.md
M extensions/Constraints/WikibaseQualityConstraints.alias.php
M extensions/Constraints/WikibaseQualityConstraintsHooks.php
M extensions/Constraints/api/CheckConstraints.php
M extensions/Constraints/build/travis/after_script.sh
M extensions/Constraints/build/travis/before_script.sh
M extensions/Constraints/build/travis/script.sh
M extensions/Constraints/composer.json
A extensions/Constraints/docs/user.js
M extensions/Constraints/i18n/de.json
M extensions/Constraints/i18n/en.json
M extensions/Constraints/i18n/fr.json
M extensions/Constraints/i18n/he.json
M extensions/Constraints/i18n/it.json
M extensions/Constraints/i18n/mk.json
M extensions/Constraints/i18n/qqq.json
M extensions/Constraints/i18n/zh-hans.json
M extensions/Constraints/includes/ConstraintCheck/Checker/CommonsLinkChecker.php
M 
extensions/Constraints/includes/ConstraintCheck/Checker/ConflictsWithChecker.php
M 
extensions/Constraints/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/FormatChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/InverseChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/ItemChecker.php
M 
extensions/Constraints/includes/ConstraintCheck/Checker/MandatoryQualifiersChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/MultiValueChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/OneOfChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/QualifierChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/QualifiersChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/RangeChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/SingleValueChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/SymmetricChecker.php
M 
extensions/Constraints/includes/ConstraintCheck/Checker/TargetRequiredClaimChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/TypeChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/UniqueValueChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/ValueTypeChecker.php
M 
extensions/Constraints/includes/ConstraintCheck/DelegatingConstraintChecker.php
M 
extensions/Constraints/includes/ConstraintCheck/Helper/ConnectionCheckerHelper.php
M 
extensions/Constraints/includes/ConstraintCheck/Helper/ConstraintParameterParser.php
M extensions/Constraints/includes/ConstraintCheck/Helper/RangeCheckerHelper.php
M extensions/Constraints/includes/ConstraintCheck/Helper/TypeCheckerHelper.php
M 
extensions/Constraints/includes/ConstraintCheck/Helper/ValueCountCheckerHelper.php
M extensions/Constraints/includes/ConstraintCheck/Result/CheckResult.php
M extensions/Constraints/includes/ConstraintParameterRenderer.php
M extensions/Constraints/includes/ConstraintReportFactory.php
M extensions/Constraints/includes/ConstraintRepository.php
M extensions/Constraints/maintenance/UpdateConstraintsTable.php
M extensions/Constraints/modules/SpecialConstraintReportPage.js
A extensions/Constraints/phpcs.xml
M extensions/Constraints/specials/SpecialConstraintReport.php
M extensions/Constraints/sql/create_wbqc_constraints.sql
M extensions/Constraints/tests/phpunit/Api/CheckConstraintsTest.php
M 
extensions/Constraints/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php
M 
extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/ItemCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/SymmetricCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/TargetRequiredClaimCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/FormatChecker/FormatCheckerTest.php
M extensions/Constraints/tests/phpunit/Checker/OneOfChecker/OneOfCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/QualifierChecker/MandatoryQualifiersCheckerTest.php
M

[MediaWiki-commits] [Gerrit] mediawiki...release[master]: Bump Wikidata to wmf/1.30.0-wmf.1

2017-05-08 Thread Aude (Code Review)

Aude has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352740 )

Change subject: Bump Wikidata to wmf/1.30.0-wmf.1
..

Bump Wikidata to wmf/1.30.0-wmf.1

Change-Id: Ia554f1bd1a18688356dbd6af7cd0d4b467259a24
---
M make-wmf-branch/config.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release 
refs/changes/40/352740/1

diff --git a/make-wmf-branch/config.json b/make-wmf-branch/config.json
index 887dd31..53d5076 100644
--- a/make-wmf-branch/config.json
+++ b/make-wmf-branch/config.json
@@ -175,7 +175,7 @@
"@": "Set a string for the specific commit, branch, or tag",
"special_extensions": {
"CentralNotice": "wmf_deploy",
-   "Wikidata": "wmf/1.29.0-wmf.21",
+   "Wikidata": "wmf/1.30.0-wmf.1",
"SemanticForms": "3.7",
"SemanticMediaWiki": "1.8.x",
"SemanticResultFormats": "1.8.x",

-- 
To view, visit https://gerrit.wikimedia.org/r/352740
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia554f1bd1a18688356dbd6af7cd0d4b467259a24
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: Aude 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Prettify MessageCache::loadFromDB()-small query

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352623 )

Change subject: Prettify MessageCache::loadFromDB()-small query
..


Prettify MessageCache::loadFromDB()-small query

Adjust the call so it uses JOIN...ON syntax rather than comma joins.

Bug: T164666
Change-Id: I93c8569620d543e9507d0adf1283443915f50d4b
---
M includes/cache/MessageCache.php
1 file changed, 6 insertions(+), 3 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified
  Jcrespo: Looks good to me, but someone else must approve



diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index 5caa7d5..c992112 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -515,15 +515,18 @@
 
# Conditions to load the remaining pages with their contents
$smallConds = $conds;
-   $smallConds[] = 'page_latest=rev_id';
-   $smallConds[] = 'rev_text_id=old_id';
$smallConds[] = 'page_len <= ' . intval( 
$wgMaxMsgCacheEntrySize );
 
$res = $dbr->select(
[ 'page', 'revision', 'text' ],
[ 'page_title', 'old_id', 'old_text', 'old_flags' ],
$smallConds,
-   __METHOD__ . "($code)-small"
+   __METHOD__ . "($code)-small",
+   [],
+   [
+   'revision' => [ 'JOIN', 'page_latest=rev_id' ],
+   'text' => [ 'JOIN', 'rev_text_id=old_id' ],
+   ]
);
 
foreach ( $res as $row ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/352623
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I93c8569620d543e9507d0adf1283443915f50d4b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: MessageCache: Avoid 'contributions' replicas

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352624 )

Change subject: MessageCache: Avoid 'contributions' replicas
..


MessageCache: Avoid 'contributions' replicas

On WMF wikis, the partitioning of the revision table on the
'contributions' replicas makes the query here perform really poorly.
Specify 'api' as a hack for now to avoid those replicas.

This query happens once per day per wiki, plus when someone edits the
MediaWiki namespace, so it shouldn't be much additional load.

Bug: T164666
Change-Id: I5ae74d1702144f6475e9cfb13effc43389d66233
---
M includes/cache/MessageCache.php
1 file changed, 5 insertions(+), 1 deletion(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified
  Jcrespo: Looks good to me, but someone else must approve



diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index c992112..8f88ee9 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -464,7 +464,11 @@
protected function loadFromDB( $code, $mode = null ) {
global $wgMaxMsgCacheEntrySize, $wgLanguageCode, 
$wgAdaptiveMessageCache;
 
-   $dbr = wfGetDB( ( $mode == self::FOR_UPDATE ) ? DB_MASTER : 
DB_REPLICA );
+   // (T164666) The query here performs really poorly on WMF's
+   // contributions replicas. We don't have a way to say "any 
group except
+   // contributions", so for the moment let's specify 'api'.
+   // @todo: Get rid of this hack.
+   $dbr = wfGetDB( ( $mode == self::FOR_UPDATE ) ? DB_MASTER : 
DB_REPLICA, 'api' );
 
$cache = [];
 

-- 
To view, visit https://gerrit.wikimedia.org/r/352624
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5ae74d1702144f6475e9cfb13effc43389d66233
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[wmf/1.30.0-wmf.1]: New deployment build - wmf/1.30.0-wmf.1

2017-05-08 Thread Aude (Code Review)

Aude has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352739 )

Change subject: New deployment build - wmf/1.30.0-wmf.1
..

New deployment build - wmf/1.30.0-wmf.1

Change-Id: Ib053c6b78a5e4fde626318437ff161eb6f7a4eb9
---
M WikibaseClient.settings.php
M WikibaseRepo.settings.php
M composer.json
M composer.lock
M extensions/ArticlePlaceholder/composer.json
M extensions/ArticlePlaceholder/i18n/bn.json
M extensions/ArticlePlaceholder/i18n/hi.json
M extensions/ArticlePlaceholder/includes/AboutTopicRenderer.php
M 
extensions/ArticlePlaceholder/tests/phpunit/includes/AboutTopicRendererTest.php
M extensions/Constraints/.gitignore
M extensions/Constraints/.jshintrc
M extensions/Constraints/README.md
M extensions/Constraints/WikibaseQualityConstraints.alias.php
M extensions/Constraints/WikibaseQualityConstraintsHooks.php
M extensions/Constraints/api/CheckConstraints.php
M extensions/Constraints/build/travis/after_script.sh
M extensions/Constraints/build/travis/before_script.sh
M extensions/Constraints/build/travis/script.sh
M extensions/Constraints/composer.json
A extensions/Constraints/docs/user.js
M extensions/Constraints/i18n/de.json
M extensions/Constraints/i18n/en.json
M extensions/Constraints/i18n/fr.json
M extensions/Constraints/i18n/he.json
M extensions/Constraints/i18n/it.json
M extensions/Constraints/i18n/mk.json
M extensions/Constraints/i18n/qqq.json
M extensions/Constraints/i18n/zh-hans.json
M extensions/Constraints/includes/ConstraintCheck/Checker/CommonsLinkChecker.php
M 
extensions/Constraints/includes/ConstraintCheck/Checker/ConflictsWithChecker.php
M 
extensions/Constraints/includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/FormatChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/InverseChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/ItemChecker.php
M 
extensions/Constraints/includes/ConstraintCheck/Checker/MandatoryQualifiersChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/MultiValueChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/OneOfChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/QualifierChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/QualifiersChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/RangeChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/SingleValueChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/SymmetricChecker.php
M 
extensions/Constraints/includes/ConstraintCheck/Checker/TargetRequiredClaimChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/TypeChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/UniqueValueChecker.php
M extensions/Constraints/includes/ConstraintCheck/Checker/ValueTypeChecker.php
M 
extensions/Constraints/includes/ConstraintCheck/DelegatingConstraintChecker.php
M 
extensions/Constraints/includes/ConstraintCheck/Helper/ConnectionCheckerHelper.php
M 
extensions/Constraints/includes/ConstraintCheck/Helper/ConstraintParameterParser.php
M extensions/Constraints/includes/ConstraintCheck/Helper/RangeCheckerHelper.php
M extensions/Constraints/includes/ConstraintCheck/Helper/TypeCheckerHelper.php
M 
extensions/Constraints/includes/ConstraintCheck/Helper/ValueCountCheckerHelper.php
M extensions/Constraints/includes/ConstraintCheck/Result/CheckResult.php
M extensions/Constraints/includes/ConstraintParameterRenderer.php
M extensions/Constraints/includes/ConstraintReportFactory.php
M extensions/Constraints/includes/ConstraintRepository.php
M extensions/Constraints/maintenance/UpdateConstraintsTable.php
M extensions/Constraints/modules/SpecialConstraintReportPage.js
A extensions/Constraints/phpcs.xml
M extensions/Constraints/specials/SpecialConstraintReport.php
M extensions/Constraints/sql/create_wbqc_constraints.sql
M extensions/Constraints/tests/phpunit/Api/CheckConstraintsTest.php
M 
extensions/Constraints/tests/phpunit/Checker/CommonsLinkChecker/CommonsLinkCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/ConflictsWithCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/ConnectionCheckerHelperTest.php
M 
extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/InverseCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/ItemCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/SymmetricCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/ConnectionChecker/TargetRequiredClaimCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/FormatChecker/FormatCheckerTest.php
M extensions/Constraints/tests/phpunit/Checker/OneOfChecker/OneOfCheckerTest.php
M 
extensions/Constraints/tests/phpunit/Checker/QualifierChecker/MandatoryQualifiersCheckerTest.php
M

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: ApiQueryRevisions: Restore use of rvstartid/rvendid as a tie...

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352632 )

Change subject: ApiQueryRevisions: Restore use of rvstartid/rvendid as a 
tiebreaker
..


ApiQueryRevisions: Restore use of rvstartid/rvendid as a tiebreaker

If rvstartid/rvendid are used with revisions that have the same
timestamp, we should omit any revisions with the same timestamp but
out-of-range IDs.

Bug: T163532
Change-Id: I6ba5e0724945668dad55eec0d09cb7d3fe08e347
---
M includes/api/ApiQueryRevisions.php
1 file changed, 26 insertions(+), 4 deletions(-)

Approvals:
  Tim Starling: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/api/ApiQueryRevisions.php 
b/includes/api/ApiQueryRevisions.php
index 3e077c3..b0a8468 100644
--- a/includes/api/ApiQueryRevisions.php
+++ b/includes/api/ApiQueryRevisions.php
@@ -259,12 +259,34 @@
$p = $this->encodeParamName( 'endid' );
$this->dieWithError( [ 
'apierror-revisions-badid', $p ], "badid_$p" );
}
+
+   if ( $params['start'] !== null ) {
+   $op = ( $params['dir'] === 'newer' ? 
'>' : '<' );
+   $ts = $db->addQuotes( 
$db->timestampOrNull( $params['start'] ) );
+   if ( $params['startid'] !== null ) {
+   $this->addWhere( "rev_timestamp 
$op $ts OR "
+   . "rev_timestamp = $ts 
AND rev_id $op= " . intval( $params['startid'] ) );
+   } else {
+   $this->addWhere( "rev_timestamp 
$op= $ts" );
+   }
+   }
+   if ( $params['end'] !== null ) {
+   $op = ( $params['dir'] === 'newer' ? 
'<' : '>' ); // Yes, opposite of the above
+   $ts = $db->addQuotes( 
$db->timestampOrNull( $params['end'] ) );
+   if ( $params['endid'] !== null ) {
+   $this->addWhere( "rev_timestamp 
$op $ts OR "
+   . "rev_timestamp = $ts 
AND rev_id $op= " . intval( $params['endid'] ) );
+   } else {
+   $this->addWhere( "rev_timestamp 
$op= $ts" );
+   }
+   }
+   } else {
+   $this->addTimestampWhereRange( 'rev_timestamp', 
$params['dir'],
+   $params['start'], $params['end'] );
}
 
-   $this->addTimestampWhereRange( 'rev_timestamp', 
$params['dir'],
-   $params['start'], $params['end'] );
-   // Dummy to add rev_id to ORDER BY
-   $this->addWhereRange( 'rev_id', $params['dir'], null, 
null );
+   $sort = ( $params['dir'] === 'newer' ? '' : 'DESC' );
+   $this->addOption( 'ORDER BY', [ "rev_timestamp $sort", 
"rev_id $sort" ] );
 
// There is only one ID, use it
$ids = array_keys( $pageSet->getGoodTitles() );

-- 
To view, visit https://gerrit.wikimedia.org/r/352632
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6ba5e0724945668dad55eec0d09cb7d3fe08e347
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: stop trying to use variable variables in erb

2017-05-08 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352738 )

Change subject: icinga: stop trying to use variable variables in erb
..


icinga: stop trying to use variable variables in erb

Change-Id: I926845acff8dc74fd4e0942687d7e8adc281cb12
---
M modules/nagios_common/templates/contacts-new.cfg.erb
1 file changed, 8 insertions(+), 9 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/nagios_common/templates/contacts-new.cfg.erb 
b/modules/nagios_common/templates/contacts-new.cfg.erb
index b951926..9da04d9 100644
--- a/modules/nagios_common/templates/contacts-new.cfg.erb
+++ b/modules/nagios_common/templates/contacts-new.cfg.erb
@@ -26,30 +26,29 @@
 
 <%- contact = 'dzahn' -%>
 define contact{
-contact_name<%= contact %>
+contact_namedzahn
 alias   daniel_zahn
 host_notification_periodPST_awake_hours
 service_notification_period PST_awake_hours
 host_notification_options   d,r,f
 service_notification_optionsc,r,f
-email   <%= 
scope.function_hiera(['icinga::contacts::#{contact}::email']) %>
-pager   <%= 
scope.function_hiera(['icinga::contacts::#{contact}::pager']) %>
-address1<%= 
scope.function_hiera(['icinga::contacts::#{contact}::address1']) %>
+email   <%= 
scope.function_hiera(['icinga::contacts::dzahn::email']) %>
+pager   <%= 
scope.function_hiera(['icinga::contacts::dzahn::pager']) %>
+address1<%= 
scope.function_hiera(['icinga::contacts::dzahn::address1']) %>
 host_notification_commands  
host-notify-by-email,host-notify-by-sms-gateway
 service_notification_commands   notify-by-email,notify-by-sms-gateway
 }
 
-<%- contact = 'bblack' -%>
 define contact{
-contact_name<%= contact %>
+contact_namebblack
 alias   Brandon Black
 host_notification_period24x7
 service_notification_period 24x7
 host_notification_options   d,r,f
 service_notification_optionsc,r,f
-email   <%= 
scope.function_hiera(['icinga::contacts::#{contact}::email']) %>
-pager   <%= 
scope.function_hiera(['icinga::contacts::#{contact}::pager']) %>
-address1<%= 
scope.function_hiera(['icinga::contacts::#{contact}::address1']) %>
+email   <%= 
scope.function_hiera(['icinga::contacts::bblack::email']) %>
+pager   <%= 
scope.function_hiera(['icinga::contacts::bblack::pager']) %>
+address1<%= 
scope.function_hiera(['icinga::contacts::bblack::address1']) %>
 host_notification_commands  
host-notify-by-email,host-notify-by-sms-gateway
 service_notification_commands   notify-by-email,notify-by-sms-gateway
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/352738
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I926845acff8dc74fd4e0942687d7e8adc281cb12
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: stop trying to use variable variables in erb

2017-05-08 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352738 )

Change subject: icinga: stop trying to use variable variables in erb
..

icinga: stop trying to use variable variables in erb

Change-Id: I926845acff8dc74fd4e0942687d7e8adc281cb12
---
M modules/nagios_common/templates/contacts-new.cfg.erb
1 file changed, 8 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/38/352738/1

diff --git a/modules/nagios_common/templates/contacts-new.cfg.erb 
b/modules/nagios_common/templates/contacts-new.cfg.erb
index b951926..9da04d9 100644
--- a/modules/nagios_common/templates/contacts-new.cfg.erb
+++ b/modules/nagios_common/templates/contacts-new.cfg.erb
@@ -26,30 +26,29 @@
 
 <%- contact = 'dzahn' -%>
 define contact{
-contact_name<%= contact %>
+contact_namedzahn
 alias   daniel_zahn
 host_notification_periodPST_awake_hours
 service_notification_period PST_awake_hours
 host_notification_options   d,r,f
 service_notification_optionsc,r,f
-email   <%= 
scope.function_hiera(['icinga::contacts::#{contact}::email']) %>
-pager   <%= 
scope.function_hiera(['icinga::contacts::#{contact}::pager']) %>
-address1<%= 
scope.function_hiera(['icinga::contacts::#{contact}::address1']) %>
+email   <%= 
scope.function_hiera(['icinga::contacts::dzahn::email']) %>
+pager   <%= 
scope.function_hiera(['icinga::contacts::dzahn::pager']) %>
+address1<%= 
scope.function_hiera(['icinga::contacts::dzahn::address1']) %>
 host_notification_commands  
host-notify-by-email,host-notify-by-sms-gateway
 service_notification_commands   notify-by-email,notify-by-sms-gateway
 }
 
-<%- contact = 'bblack' -%>
 define contact{
-contact_name<%= contact %>
+contact_namebblack
 alias   Brandon Black
 host_notification_period24x7
 service_notification_period 24x7
 host_notification_options   d,r,f
 service_notification_optionsc,r,f
-email   <%= 
scope.function_hiera(['icinga::contacts::#{contact}::email']) %>
-pager   <%= 
scope.function_hiera(['icinga::contacts::#{contact}::pager']) %>
-address1<%= 
scope.function_hiera(['icinga::contacts::#{contact}::address1']) %>
+email   <%= 
scope.function_hiera(['icinga::contacts::bblack::email']) %>
+pager   <%= 
scope.function_hiera(['icinga::contacts::bblack::pager']) %>
+address1<%= 
scope.function_hiera(['icinga::contacts::bblack::address1']) %>
 host_notification_commands  
host-notify-by-email,host-notify-by-sms-gateway
 service_notification_commands   notify-by-email,notify-by-sms-gateway
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/352738
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I926845acff8dc74fd4e0942687d7e8adc281cb12
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: fix syntax for variable variables in erb

2017-05-08 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352736 )

Change subject: icinga: fix syntax for variable variables in erb
..


icinga: fix syntax for variable variables in erb

Change-Id: Ie68719a7cf2fbf4dee4a358f9ce8a49d8883b994
---
M modules/nagios_common/templates/contacts-new.cfg.erb
1 file changed, 6 insertions(+), 6 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/nagios_common/templates/contacts-new.cfg.erb 
b/modules/nagios_common/templates/contacts-new.cfg.erb
index 17e6055..b951926 100644
--- a/modules/nagios_common/templates/contacts-new.cfg.erb
+++ b/modules/nagios_common/templates/contacts-new.cfg.erb
@@ -32,9 +32,9 @@
 service_notification_period PST_awake_hours
 host_notification_options   d,r,f
 service_notification_optionsc,r,f
-email   <%= 
scope.function_hiera(['icinga::contacts::${contact}::email']) %>
-pager   <%= 
scope.function_hiera(['icinga::contacts::${contact}::pager']) %>
-address1<%= 
scope.function_hiera(['icinga::contacts::${contact}::address1']) %>
+email   <%= 
scope.function_hiera(['icinga::contacts::#{contact}::email']) %>
+pager   <%= 
scope.function_hiera(['icinga::contacts::#{contact}::pager']) %>
+address1<%= 
scope.function_hiera(['icinga::contacts::#{contact}::address1']) %>
 host_notification_commands  
host-notify-by-email,host-notify-by-sms-gateway
 service_notification_commands   notify-by-email,notify-by-sms-gateway
 }
@@ -47,9 +47,9 @@
 service_notification_period 24x7
 host_notification_options   d,r,f
 service_notification_optionsc,r,f
-email   <%= 
scope.function_hiera(['icinga::contacts::${contact}::email']) %>
-pager   <%= 
scope.function_hiera(['icinga::contacts::${contact}::pager']) %>
-address1<%= 
scope.function_hiera(['icinga::contacts::${contact}::address1']) %>
+email   <%= 
scope.function_hiera(['icinga::contacts::#{contact}::email']) %>
+pager   <%= 
scope.function_hiera(['icinga::contacts::#{contact}::pager']) %>
+address1<%= 
scope.function_hiera(['icinga::contacts::#{contact}::address1']) %>
 host_notification_commands  
host-notify-by-email,host-notify-by-sms-gateway
 service_notification_commands   notify-by-email,notify-by-sms-gateway
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/352736
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie68719a7cf2fbf4dee4a358f9ce8a49d8883b994
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: fix syntax for variable variables in erb

2017-05-08 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352736 )

Change subject: icinga: fix syntax for variable variables in erb
..

icinga: fix syntax for variable variables in erb

Change-Id: Ie68719a7cf2fbf4dee4a358f9ce8a49d8883b994
---
M modules/nagios_common/templates/contacts-new.cfg.erb
1 file changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/352736/1

diff --git a/modules/nagios_common/templates/contacts-new.cfg.erb 
b/modules/nagios_common/templates/contacts-new.cfg.erb
index 17e6055..e31ca30 100644
--- a/modules/nagios_common/templates/contacts-new.cfg.erb
+++ b/modules/nagios_common/templates/contacts-new.cfg.erb
@@ -32,9 +32,9 @@
 service_notification_period PST_awake_hours
 host_notification_options   d,r,f
 service_notification_optionsc,r,f
-email   <%= 
scope.function_hiera(['icinga::contacts::${contact}::email']) %>
-pager   <%= 
scope.function_hiera(['icinga::contacts::${contact}::pager']) %>
-address1<%= 
scope.function_hiera(['icinga::contacts::${contact}::address1']) %>
+email   <%= 
scope.function_hiera(['icinga::contacts::#{contact} %>::email']) %>
+pager   <%= 
scope.function_hiera(['icinga::contacts::#{contact} %>::pager']) %>
+address1<%= 
scope.function_hiera(['icinga::contacts::#{contact} %>::address1']) %>
 host_notification_commands  
host-notify-by-email,host-notify-by-sms-gateway
 service_notification_commands   notify-by-email,notify-by-sms-gateway
 }
@@ -47,9 +47,9 @@
 service_notification_period 24x7
 host_notification_options   d,r,f
 service_notification_optionsc,r,f
-email   <%= 
scope.function_hiera(['icinga::contacts::${contact}::email']) %>
-pager   <%= 
scope.function_hiera(['icinga::contacts::${contact}::pager']) %>
-address1<%= 
scope.function_hiera(['icinga::contacts::${contact}::address1']) %>
+email   <%= 
scope.function_hiera(['icinga::contacts::#{contact} %>::email']) %>
+pager   <%= 
scope.function_hiera(['icinga::contacts::#{contact} %>::pager']) %>
+address1<%= 
scope.function_hiera(['icinga::contacts::#{contact} %>::address1']) %>
 host_notification_commands  
host-notify-by-email,host-notify-by-sms-gateway
 service_notification_commands   notify-by-email,notify-by-sms-gateway
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/352736
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie68719a7cf2fbf4dee4a358f9ce8a49d8883b994
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Check tags with ChangeTags::canCreateTag

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352733 )

Change subject: Check tags with ChangeTags::canCreateTag
..


Check tags with ChangeTags::canCreateTag

These are also user-provided tag names, so should be checked with
ChangeTags::canCreateTag, which is intended for that purpose.

This check also applies on edits.

Bug: T164133
Change-Id: Iaf161d538f225a86c7abf8a8a347de9169d781bf
---
M Views/AbuseFilterViewEdit.php
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Views/AbuseFilterViewEdit.php b/Views/AbuseFilterViewEdit.php
index 59d67a3..90be828 100644
--- a/Views/AbuseFilterViewEdit.php
+++ b/Views/AbuseFilterViewEdit.php
@@ -111,7 +111,9 @@
$bad = false;
foreach ( $actions['tag']['parameters'] as $tag 
) {
$t = Title::makeTitleSafe( 
NS_MEDIAWIKI, 'tag-' . $tag );
-   if ( !$t ) {
+   if ( !$t ||
+   !ChangeTags::canCreateTag( 
$tag, $user )->isOK() ) {
+
$bad = true;
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/352733
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf161d538f225a86c7abf8a8a347de9169d781bf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: back to multi-level hierarchy, add another contact, ...

2017-05-08 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352731 )

Change subject: icinga: back to multi-level hierarchy, add another contact, use 
local var in .erb
..


icinga: back to multi-level hierarchy, add another contact, use local var in 
.erb

Go back to multi-level hierarchy in Hiera after fixing structure in private 
repo.

Use a local variable in the .erb template to avoid repeating
the same string multiple times.

Add a second contact to confirm the Hiera structure is found.

Change-Id: Ia2df8526ec7e7c90dc1b362595f0d188924a690e
---
M modules/nagios_common/templates/contacts-new.cfg.erb
1 file changed, 20 insertions(+), 4 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/nagios_common/templates/contacts-new.cfg.erb 
b/modules/nagios_common/templates/contacts-new.cfg.erb
index 231be6d..17e6055 100644
--- a/modules/nagios_common/templates/contacts-new.cfg.erb
+++ b/modules/nagios_common/templates/contacts-new.cfg.erb
@@ -24,16 +24,32 @@
 service_notification_commands   notify-service-by-irc-wikidata
 }
 
+<%- contact = 'dzahn' -%>
 define contact{
-contact_namedzahn
+contact_name<%= contact %>
 alias   daniel_zahn
 host_notification_periodPST_awake_hours
 service_notification_period PST_awake_hours
 host_notification_options   d,r,f
 service_notification_optionsc,r,f
-email   <%= 
scope.function_hiera(['icinga_contacts_dzahn_email']) %>
-pager   <%= 
scope.function_hiera(['icinga_contacts_dzahn_pager']) %>
-address1<%= 
scope.function_hiera(['icinga_contacts_dzahn_address1']) %>
+email   <%= 
scope.function_hiera(['icinga::contacts::${contact}::email']) %>
+pager   <%= 
scope.function_hiera(['icinga::contacts::${contact}::pager']) %>
+address1<%= 
scope.function_hiera(['icinga::contacts::${contact}::address1']) %>
+host_notification_commands  
host-notify-by-email,host-notify-by-sms-gateway
+service_notification_commands   notify-by-email,notify-by-sms-gateway
+}
+
+<%- contact = 'bblack' -%>
+define contact{
+contact_name<%= contact %>
+alias   Brandon Black
+host_notification_period24x7
+service_notification_period 24x7
+host_notification_options   d,r,f
+service_notification_optionsc,r,f
+email   <%= 
scope.function_hiera(['icinga::contacts::${contact}::email']) %>
+pager   <%= 
scope.function_hiera(['icinga::contacts::${contact}::pager']) %>
+address1<%= 
scope.function_hiera(['icinga::contacts::${contact}::address1']) %>
 host_notification_commands  
host-notify-by-email,host-notify-by-sms-gateway
 service_notification_commands   notify-by-email,notify-by-sms-gateway
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/352731
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2df8526ec7e7c90dc1b362595f0d188924a690e
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] oojs/ui[master]: OptionWidget: Use parent selector for icon/indicator/label s...

2017-05-08 Thread Catrope (Code Review)

Catrope has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352735 )

Change subject: OptionWidget: Use parent selector for icon/indicator/label 
styles
..

OptionWidget: Use parent selector for icon/indicator/label styles

This was using a descendant selector, which affected icons, indicators
and labels inside of other widgets that were put inside OptionWidgets.

Bug: T164550
Change-Id: Ib52025c4ad4c3f3a10064d7ecef571d9087e33aa
---
M src/styles/widgets/DecoratedOptionWidget.less
M src/styles/widgets/OptionWidget.less
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/35/352735/1

diff --git a/src/styles/widgets/DecoratedOptionWidget.less 
b/src/styles/widgets/DecoratedOptionWidget.less
index 744e730..2a230d4 100644
--- a/src/styles/widgets/DecoratedOptionWidget.less
+++ b/src/styles/widgets/DecoratedOptionWidget.less
@@ -1,8 +1,8 @@
 @import '../common';
 
 .oo-ui-decoratedOptionWidget {
-   .oo-ui-iconElement-icon,
-   .oo-ui-indicatorElement-indicator {
+   > .oo-ui-iconElement-icon,
+   > .oo-ui-indicatorElement-indicator {
position: absolute;
}
 
diff --git a/src/styles/widgets/OptionWidget.less 
b/src/styles/widgets/OptionWidget.less
index 837532b..cfdf71b 100644
--- a/src/styles/widgets/OptionWidget.less
+++ b/src/styles/widgets/OptionWidget.less
@@ -11,7 +11,7 @@
cursor: default;
}
 
-   &.oo-ui-labelElement .oo-ui-labelElement-label {
+   &.oo-ui-labelElement > .oo-ui-labelElement-label {
display: block;
white-space: nowrap;
text-overflow: ellipsis;

-- 
To view, visit https://gerrit.wikimedia.org/r/352735
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib52025c4ad4c3f3a10064d7ecef571d9087e33aa
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Catrope 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Follow-up I5cede8: fix JS error when user has no filters saved

2017-05-08 Thread Catrope (Code Review)

Catrope has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352734 )

Change subject: Follow-up I5cede8: fix JS error when user has no filters saved
..

Follow-up I5cede8: fix JS error when user has no filters saved

Change-Id: Ie7de070925874d2c29e185a90d65a0b0a72f07cd
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/34/352734/1

diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
index 7131341..04fb52b 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
@@ -75,7 +75,7 @@
this.baseState = baseState;
 
this.clearItems();
-   $.each( savedQueries.queries, function ( id, obj ) {
+   $.each( savedQueries.queries || {}, function ( id, obj ) {
var normalizedData = $.extend( true, {}, baseState, 
obj.data );
items.push(
new mw.rcfilters.dm.SavedQueryItemModel(

-- 
To view, visit https://gerrit.wikimedia.org/r/352734
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7de070925874d2c29e185a90d65a0b0a72f07cd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Catrope 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Followup I5cede8: Make the SavedQueries popup larger

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352732 )

Change subject: Followup I5cede8: Make the SavedQueries popup larger
..


Followup I5cede8: Make the SavedQueries popup larger

The labels and popup are now slightly wider.

Bug: T151994
Bug: T164128
Change-Id: I64bd496ade241c800fcb0bb12023486e7d601a23
---
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
2 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
index 0a72984..66ceb64 100644
--- 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
+++ 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
@@ -27,11 +27,11 @@
&-input {
display: inline-block;
margin-right: 0;
-   width: 12em;
+   width: 15em;
}
 
&-label {
-   max-width: 12em;
+   max-width: 15em;
display: inline-block;
vertical-align: middle;
text-overflow: ellipsis;
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
index 6be9a78..9ae1d34 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
@@ -32,7 +32,7 @@
icon: 'unClip',
$overlay: this.$overlay,
popup: {
-   width: 250,
+   width: 300,
anchor: false,
align: 'forwards',
$autoCloseIgnore: this.$overlay,

-- 
To view, visit https://gerrit.wikimedia.org/r/352732
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I64bd496ade241c800fcb0bb12023486e7d601a23
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Followup I5cede8: Fixup SavedQueries styling and event

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352729 )

Change subject: Followup I5cede8: Fixup SavedQueries styling and event
..


Followup I5cede8: Fixup SavedQueries styling and event

Includes small styling fixes to saved queries and the ability
to update the label of an existing matched query if we rename
it.

Bug: T151994
Bug: T164128
Change-Id: Ic46b082cbfc3462f1d61895bcfc7c545902b2d1a
---
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
3 files changed, 23 insertions(+), 4 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
index 76e1c48..0a72984 100644
--- 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
+++ 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
@@ -26,6 +26,7 @@
 
&-input {
display: inline-block;
+   margin-right: 0;
width: 12em;
}
 
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
index ea1d1c3..cbf8747 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
@@ -26,6 +26,7 @@
this.model = model;
this.queriesModel = savedQueriesModel;
this.$overlay = config.$overlay || this.$element;
+   this.matchingQuery = null;
 
// Parent
mw.rcfilters.ui.FilterTagMultiselectWidget.parent.call( this, 
$.extend( true, {
@@ -93,6 +94,7 @@
click: 'onSaveQueryButtonClick',
saveCurrent: 'setSavedQueryVisibility'
} );
+   this.queriesModel.connect( this, { itemUpdate: 
'onSavedQueriesItemUpdate' } );
 
// Build the content
$contentWrapper.append(
@@ -146,6 +148,19 @@
 */

mw.rcfilters.ui.FilterTagMultiselectWidget.prototype.onSaveQueryButtonClick = 
function () {
this.getMenu().toggle( false );
+   };
+
+   /**
+* Respond to save query item change. Mainly this is done to update the 
label in case
+* a query item has been edited
+*
+* @param {mw.rcfilters.dm.SavedQueryItemModel} item Saved query item
+*/
+   
mw.rcfilters.ui.FilterTagMultiselectWidget.prototype.onSavedQueriesItemUpdate = 
function ( item ) {
+   if ( this.matchingQuery === item ) {
+   // This means we just edited the item that is currently 
matched
+   this.savedQueryTitle.setLabel( item.getLabel() );
+   }
};
 
/**
@@ -206,15 +221,15 @@
 * Set the visibility of the saved query button
 */

mw.rcfilters.ui.FilterTagMultiselectWidget.prototype.setSavedQueryVisibility = 
function () {
-   var matchingQuery = 
this.controller.findQueryMatchingCurrentState();
+   this.matchingQuery = 
this.controller.findQueryMatchingCurrentState();
 
this.savedQueryTitle.setLabel(
-   matchingQuery ? matchingQuery.getLabel() : ''
+   this.matchingQuery ? this.matchingQuery.getLabel() : ''
);
-   this.savedQueryTitle.toggle( !!matchingQuery );
+   this.savedQueryTitle.toggle( !!this.matchingQuery );
this.saveQueryButton.toggle(
!this.isEmpty() &&
-   !matchingQuery
+   !this.matchingQuery
);
};
/**
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
index 3e6fb77..51b348e 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
@@ -193,6 +193,9 @@
} else if ( action === 'default' ) {
this.emit( 'default', !this.default );
}
+   // Reset selected
+   this.menu.selectItem( null );
+   // Close the menu
this.menu.toggle( false );
};
 

-- 
To view,

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Followup I5cede8: Make the SavedQueries popup larger

2017-05-08 Thread Mooeypoo (Code Review)

Mooeypoo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352732 )

Change subject: Followup I5cede8: Make the SavedQueries popup larger
..

Followup I5cede8: Make the SavedQueries popup larger

The labels and popup are now slightly wider.

Bug: T151994
Bug: T164128
Change-Id: I64bd496ade241c800fcb0bb12023486e7d601a23
---
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/32/352732/1

diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
index 0a72984..66ceb64 100644
--- 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
+++ 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
@@ -27,11 +27,11 @@
&-input {
display: inline-block;
margin-right: 0;
-   width: 12em;
+   width: 15em;
}
 
&-label {
-   max-width: 12em;
+   max-width: 15em;
display: inline-block;
vertical-align: middle;
text-overflow: ellipsis;
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
index 6be9a78..9ae1d34 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
@@ -32,7 +32,7 @@
icon: 'unClip',
$overlay: this.$overlay,
popup: {
-   width: 250,
+   width: 300,
anchor: false,
align: 'forwards',
$autoCloseIgnore: this.$overlay,

-- 
To view, visit https://gerrit.wikimedia.org/r/352732
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I64bd496ade241c800fcb0bb12023486e7d601a23
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: add another contact, use local var in .erb

2017-05-08 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352731 )

Change subject: icinga: add another contact, use local var in .erb
..

icinga: add another contact, use local var in .erb

Use a local variable in the .erb template to avoid repeating
the same string multiple times.

Add a second contact to confirm the Hiera structure is found.

Change-Id: Ia2df8526ec7e7c90dc1b362595f0d188924a690e
---
M modules/nagios_common/templates/contacts-new.cfg.erb
1 file changed, 20 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/31/352731/1

diff --git a/modules/nagios_common/templates/contacts-new.cfg.erb 
b/modules/nagios_common/templates/contacts-new.cfg.erb
index 231be6d..87223bb 100644
--- a/modules/nagios_common/templates/contacts-new.cfg.erb
+++ b/modules/nagios_common/templates/contacts-new.cfg.erb
@@ -24,16 +24,32 @@
 service_notification_commands   notify-service-by-irc-wikidata
 }
 
+<% contact = dzahn %>
 define contact{
-contact_namedzahn
+contact_name<%= contact %>
 alias   daniel_zahn
 host_notification_periodPST_awake_hours
 service_notification_period PST_awake_hours
 host_notification_options   d,r,f
 service_notification_optionsc,r,f
-email   <%= 
scope.function_hiera(['icinga_contacts_dzahn_email']) %>
-pager   <%= 
scope.function_hiera(['icinga_contacts_dzahn_pager']) %>
-address1<%= 
scope.function_hiera(['icinga_contacts_dzahn_address1']) %>
+email   <%= 
scope.function_hiera(['icinga::contacts::${contact}::email']) %>
+pager   <%= 
scope.function_hiera(['icinga::contacts::${contact}::pager']) %>
+address1<%= 
scope.function_hiera(['icinga::contacts::${contact}::address1']) %>
+host_notification_commands  
host-notify-by-email,host-notify-by-sms-gateway
+service_notification_commands   notify-by-email,notify-by-sms-gateway
+}
+
+<% contact = bblack %>
+define contact{
+contact_name<%= contact %>
+alias   Brandon Black
+host_notification_period24x7
+service_notification_period 24x7
+host_notification_options   d,r,f
+service_notification_optionsc,r,f
+email   <%= 
scope.function_hiera(['icinga::contacts::${contact}::email']) %>
+pager   <%= 
scope.function_hiera(['icinga::contacts::${contact}::pager']) %>
+address1<%= 
scope.function_hiera(['icinga::contacts::${contact}::address1']) %>
 host_notification_commands  
host-notify-by-email,host-notify-by-sms-gateway
 service_notification_commands   notify-by-email,notify-by-sms-gateway
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/352731
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2df8526ec7e7c90dc1b362595f0d188924a690e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Followup I5cede8: Fixup SavedQueries styling and event

2017-05-08 Thread Mooeypoo (Code Review)

Mooeypoo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352729 )

Change subject: Followup I5cede8: Fixup SavedQueries styling and event
..

Followup I5cede8: Fixup SavedQueries styling and event

Includes small styling fixes to saved queries and the ability
to update the label of an existing matched query if we rename
it.

Bug: T151994
Bug: T164128
Change-Id: Ic46b082cbfc3462f1d61895bcfc7c545902b2d1a
---
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
3 files changed, 23 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/29/352729/1

diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
index 76e1c48..0a72984 100644
--- 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
+++ 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
@@ -26,6 +26,7 @@
 
&-input {
display: inline-block;
+   margin-right: 0;
width: 12em;
}
 
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
index ea1d1c3..cbf8747 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
@@ -26,6 +26,7 @@
this.model = model;
this.queriesModel = savedQueriesModel;
this.$overlay = config.$overlay || this.$element;
+   this.matchingQuery = null;
 
// Parent
mw.rcfilters.ui.FilterTagMultiselectWidget.parent.call( this, 
$.extend( true, {
@@ -93,6 +94,7 @@
click: 'onSaveQueryButtonClick',
saveCurrent: 'setSavedQueryVisibility'
} );
+   this.queriesModel.connect( this, { itemUpdate: 
'onSavedQueriesItemUpdate' } );
 
// Build the content
$contentWrapper.append(
@@ -146,6 +148,19 @@
 */

mw.rcfilters.ui.FilterTagMultiselectWidget.prototype.onSaveQueryButtonClick = 
function () {
this.getMenu().toggle( false );
+   };
+
+   /**
+* Respond to save query item change. Mainly this is done to update the 
label in case
+* a query item has been edited
+*
+* @param {mw.rcfilters.dm.SavedQueryItemModel} item Saved query item
+*/
+   
mw.rcfilters.ui.FilterTagMultiselectWidget.prototype.onSavedQueriesItemUpdate = 
function ( item ) {
+   if ( this.matchingQuery === item ) {
+   // This means we just edited the item that is currently 
matched
+   this.savedQueryTitle.setLabel( item.getLabel() );
+   }
};
 
/**
@@ -206,15 +221,15 @@
 * Set the visibility of the saved query button
 */

mw.rcfilters.ui.FilterTagMultiselectWidget.prototype.setSavedQueryVisibility = 
function () {
-   var matchingQuery = 
this.controller.findQueryMatchingCurrentState();
+   this.matchingQuery = 
this.controller.findQueryMatchingCurrentState();
 
this.savedQueryTitle.setLabel(
-   matchingQuery ? matchingQuery.getLabel() : ''
+   this.matchingQuery ? this.matchingQuery.getLabel() : ''
);
-   this.savedQueryTitle.toggle( !!matchingQuery );
+   this.savedQueryTitle.toggle( !!this.matchingQuery );
this.saveQueryButton.toggle(
!this.isEmpty() &&
-   !matchingQuery
+   !this.matchingQuery
);
};
/**
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
index 3e6fb77..51b348e 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
@@ -193,6 +193,9 @@
} else if ( action === 'default' ) {
this.emit( 'default', !this.default );
}
+   // Reset selected
+   this.menu.selectItem( null );
+   // Close the menu
this.menu.toggle( false );
};
 

-- 
To view,

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Follow-up fa2efb9e5 part II: Don't try to call a private fun...

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352727 )

Change subject: Follow-up fa2efb9e5 part II: Don't try to call a private 
function
..


Follow-up fa2efb9e5 part II: Don't try to call a private function

Change-Id: Icd7c15830c524b4492d0acc0528694cbc9a4f424
---
M ApiVisualEditor.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index 28847c7..b7e9e54 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -37,7 +37,7 @@
 *
 * @return VirtualRESTService the VirtualRESTService object to use
 */
-   private function getVRSObject() {
+   protected function getVRSObject() {
// the params array to create the service object with
$params = [];
// the VRS class to use, defaults to Parsoid

-- 
To view, visit https://gerrit.wikimedia.org/r/352727
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icd7c15830c524b4492d0acc0528694cbc9a4f424
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters UI: Add a 'saved queries' quick filters feature

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350763 )

Change subject: RCFilters UI: Add a 'saved queries' quick filters feature
..


RCFilters UI: Add a 'saved queries' quick filters feature

Bug: T151994
Bug: T164128
Change-Id: I5cede87633147736d3b4ee5b8ea178ae21bd441f
---
M includes/Preferences.php
M languages/i18n/en.json
M languages/i18n/qqq.json
M resources/Resources.php
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
A resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
A resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueryItemModel.js
A resources/src/mediawiki.rcfilters/images/clip.svg
A resources/src/mediawiki.rcfilters/images/pushPin.svg
A resources/src/mediawiki.rcfilters/images/unClip.svg
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
A 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SaveFiltersPopupButtonWidget.less
A 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListItemWidget.less
A 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.SavedLinksListWidget.less
M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.less
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
A 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SaveFiltersPopupButtonWidget.js
A 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListItemWidget.js
A resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
M tests/qunit/suites/resources/mediawiki.rcfilters/dm.FiltersViewModel.test.js
23 files changed, 1,581 insertions(+), 246 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Preferences.php b/includes/Preferences.php
index b428e87..4017619 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -915,6 +915,9 @@
'label-message' => 'tog-hideminor',
'section' => 'rc/advancedrc',
];
+   $defaultPreferences['rcfilters-saved-queries'] = [
+   'type' => 'api',
+   ];
 
if ( $config->get( 'RCWatchCategoryMembership' ) ) {
$defaultPreferences['hidecategorization'] = [
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index a704d39..b3e48af 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1365,6 +1365,16 @@
"recentchanges-legend-plusminus": "(±123)",
"recentchanges-submit": "Show",
"rcfilters-activefilters": "Active filters",
+   "rcfilters-quickfilters": "Quick links",
+   "rcfilters-savedqueries-defaultlabel": "Saved filters",
+   "rcfilters-savedqueries-rename": "Rename",
+   "rcfilters-savedqueries-setdefault": "Set as default",
+   "rcfilters-savedqueries-unsetdefault": "Unset as default",
+   "rcfilters-savedqueries-remove": "Remove",
+   "rcfilters-savedqueries-new-name-label": "Name",
+   "rcfilters-savedqueries-apply-label": "Create quick link",
+   "rcfilters-savedqueries-cancel-label": "Cancel",
+   "rcfilters-savedqueries-add-new-title": "Save filters as a quick link",
"rcfilters-restore-default-filters": "Restore default filters",
"rcfilters-clear-all-filters": "Clear all filters",
"rcfilters-search-placeholder": "Filter recent changes (browse or start 
typing)",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 27dc70a..929019f 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1553,6 +1553,16 @@
"recentchanges-legend-plusminus": "{{optional}}\nA plus/minus sign with 
a number for the legend.",
"recentchanges-submit": "Label for submit button in 
[[Special:RecentChanges]]\n{{Identical|Show}}",
"rcfilters-activefilters": "Title for the filters selection showing the 
active filters.",
+   "rcfilters-quickfilters": "Label for the button that opens the quick 
filters menu in [[Special:RecentChanges]]",
+   "rcfilters-savedqueries-defaultlabel": "Default name for saving a new 
set of quick filters [[Special:RecentChanges]]",
+   "rcfilters-savedqueries-rename": "Label for the menu option that edits 
a quick filter in [[Special:RecentChanges]]",
+   "rcfilters-savedqueries-setdefault": "Label for the menu option that 
sets a quick filter as default in [[Special:RecentChanges]]",
+   "rcfilters-savedqueries-unsetdefault": "Label for the menu option that 
unsets a quick filter as default in [[Special:RecentChanges]]",
+   "rcfilters-savedqueries-remove": "Label for the menu

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Fixing "Book_talk" namespace definition for ro.wikipedia: *D...

2017-05-08 Thread XXN (Code Review)

XXN has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352728 )

Change subject: Fixing "Book_talk" namespace definition for ro.wikipedia: 
*Discuţie_Book => Book_talk
..

Fixing "Book_talk" namespace definition for ro.wikipedia:
*Discuţie_Book => Book_talk

As per T68530#2824358

Change-Id: I5caf433129327ace611a2bfd34ba6d9ab9699c0d
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/28/352728/2

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index a0c00cd..79d2ecf 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -3864,7 +3864,7 @@
'Discuţie_Portal' => 101,
'Discuţie_Proiect' => 103,
'Book' => 110, // T68530
-   'Discuţie_Book' => 111,
+   'Book_talk' => 111, // T68530#2824358
],
'+rowikibooks' => [
'Discuţie_Wikibooks' => NS_PROJECT_TALK,

-- 
To view, visit https://gerrit.wikimedia.org/r/352728
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5caf433129327ace611a2bfd34ba6d9ab9699c0d
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: XXN 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Follow-up fa2efb9e5 part II: Don't try to call a private fun...

2017-05-08 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352727 )

Change subject: Follow-up fa2efb9e5 part II: Don't try to call a private 
function
..

Follow-up fa2efb9e5 part II: Don't try to call a private function

Change-Id: Icd7c15830c524b4492d0acc0528694cbc9a4f424
---
M ApiVisualEditor.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/27/352727/1

diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index 28847c7..b7e9e54 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -37,7 +37,7 @@
 *
 * @return VirtualRESTService the VirtualRESTService object to use
 */
-   private function getVRSObject() {
+   protected function getVRSObject() {
// the params array to create the service object with
$params = [];
// the VRS class to use, defaults to Parsoid

-- 
To view, visit https://gerrit.wikimedia.org/r/352727
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd7c15830c524b4492d0acc0528694cbc9a4f424
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Center elements in Parsoid HTML

2017-05-08 Thread Mholloway (Code Review)

Mholloway has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352726 )

Change subject: Center  elements in Parsoid HTML
..

Center  elements in Parsoid HTML

Bug: T164522
Change-Id: I46a4770ecdc45c7aabbbf3833497a62ba2ca44a9
---
M app/src/main/assets/preview.css
M app/src/main/assets/styles.css
2 files changed, 14 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/26/352726/1

diff --git a/app/src/main/assets/preview.css b/app/src/main/assets/preview.css
index 1e1c259..075d6f8 100644
--- a/app/src/main/assets/preview.css
+++ b/app/src/main/assets/preview.css
@@ -622,32 +622,32 @@
vertical-align: top;
display: inline-block;
}
-   
+
ul.gallery,
li.gallerybox {
zoom: 1;
*display: inline;
}
-   
+
ul.gallery {
margin: 2px;
padding: 2px;
display: block;
}
-   
+
li.gallerycaption {
font-weight: bold;
text-align: center;
display: block;
word-wrap: break-word;
}
-   
+
li.gallerybox div.thumb {
text-align: center;
border: 1px solid #ccc;
margin: 2px;
}
-   
+
div.gallerytext {
overflow: hidden;
font-size: 94%;
@@ -854,7 +854,8 @@
   -webkit-margin-start: 0 !important;
   -webkit-margin-end: 0 !important;
 }
-.content figure img {
+.content figure img,
+.content figure video {
   margin: 0.6em auto 0.6em auto;
   display: block;
   clear: both;
diff --git a/app/src/main/assets/styles.css b/app/src/main/assets/styles.css
index 97ca1cf..a31df3a 100644
--- a/app/src/main/assets/styles.css
+++ b/app/src/main/assets/styles.css
@@ -622,32 +622,32 @@
vertical-align: top;
display: inline-block;
}
-   
+
ul.gallery,
li.gallerybox {
zoom: 1;
*display: inline;
}
-   
+
ul.gallery {
margin: 2px;
padding: 2px;
display: block;
}
-   
+
li.gallerycaption {
font-weight: bold;
text-align: center;
display: block;
word-wrap: break-word;
}
-   
+
li.gallerybox div.thumb {
text-align: center;
border: 1px solid #ccc;
margin: 2px;
}
-   
+
div.gallerytext {
overflow: hidden;
font-size: 94%;
@@ -1349,7 +1349,8 @@
   -webkit-margin-start: 0 !important;
   -webkit-margin-end: 0 !important;
 }
-.content figure img {
+.content figure img,
+.content figure video {
   margin: 0.6em auto 0.6em auto;
   display: block;
   clear: both;

-- 
To view, visit https://gerrit.wikimedia.org/r/352726
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I46a4770ecdc45c7aabbbf3833497a62ba2ca44a9
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...release[master]: No more semanticness in prod

2017-05-08 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352724 )

Change subject: No more semanticness in prod
..

No more semanticness in prod

Change-Id: I9fd58ac10db8b9f8e4343d6a5a476c84c1df460d
---
M make-wmf-branch/config.json
1 file changed, 1 insertion(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release 
refs/changes/24/352724/1

diff --git a/make-wmf-branch/config.json b/make-wmf-branch/config.json
index 887dd31..d055302 100644
--- a/make-wmf-branch/config.json
+++ b/make-wmf-branch/config.json
@@ -175,10 +175,6 @@
"@": "Set a string for the specific commit, branch, or tag",
"special_extensions": {
"CentralNotice": "wmf_deploy",
-   "Wikidata": "wmf/1.29.0-wmf.21",
-   "SemanticForms": "3.7",
-   "SemanticMediaWiki": "1.8.x",
-   "SemanticResultFormats": "1.8.x",
-   "Validator": "0.5.x"
+   "Wikidata": "wmf/1.29.0-wmf.21"
}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/352724
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fd58ac10db8b9f8e4343d6a5a476c84c1df460d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Undeploy Semantic* from wikitech wikis

2017-05-08 Thread Reedy (Code Review)

Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352722 )

Change subject: Undeploy Semantic* from wikitech wikis
..

Undeploy Semantic* from wikitech wikis

Change-Id: I4b2e051f3e4846b309288021a064bb672a2f8ae5
---
M wmf-config/extension-list-wikitech
M wmf-config/wikitech.php
2 files changed, 0 insertions(+), 22 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/22/352722/1

diff --git a/wmf-config/extension-list-wikitech 
b/wmf-config/extension-list-wikitech
index 3fe18c7..f997e61 100644
--- a/wmf-config/extension-list-wikitech
+++ b/wmf-config/extension-list-wikitech
@@ -1,7 +1,3 @@
 $IP/extensions/DynamicSidebar/extension.json
 $IP/extensions/LdapAuthentication/LdapAuthentication.php
 $IP/extensions/OpenStackManager/OpenStackManager.php
-$IP/extensions/Validator/Validator.php
-$IP/extensions/SemanticMediaWiki/SemanticMediaWiki.php
-$IP/extensions/SemanticForms/SemanticForms.php
-$IP/extensions/SemanticResultFormats/SemanticResultFormats.php
diff --git a/wmf-config/wikitech.php b/wmf-config/wikitech.php
index ba14da4..fbaf950 100644
--- a/wmf-config/wikitech.php
+++ b/wmf-config/wikitech.php
@@ -4,24 +4,6 @@
 
 use MediaWiki\Logger\LoggerFactory;
 
-require_once( "$IP/extensions/Validator/Validator.php" );
-require_once( "$IP/extensions/SemanticMediaWiki/SemanticMediaWiki.php" );
-require_once( "$IP/extensions/SemanticForms/SemanticForms.php" );
-require_once( "$IP/extensions/SemanticResultFormats/SemanticResultFormats.php" 
);
-
-switch( $wgDBname ) {
-case 'labswiki' :
-   enableSemantics( 'wikitech' );
-break;
-case 'labtestwiki' :
-   enableSemantics( 'labtestwikitech' );
-break;
-}
-
-unset( $wgSpecialPages['SMWAdmin'] );
-
-$wgAPIModules['sfautocomplete'] = 'ApiDisabled';
-
 require_once( "$IP/extensions/LdapAuthentication/LdapAuthentication.php" );
 $wgAuthManagerAutoConfig['primaryauth'] += [
LdapPrimaryAuthenticationProvider::class => [

-- 
To view, visit https://gerrit.wikimedia.org/r/352722
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b2e051f3e4846b309288021a064bb672a2f8ae5
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Disable creation of new forms on wikitech"

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352721 )

Change subject: Revert "Disable creation of new forms on wikitech"
..


Revert "Disable creation of new forms on wikitech"

This reverts commit 8091876355a504974cdee7b185e4f124a56fb2c4.

Bug: T53642
Change-Id: I9f2939285900492b7bc12b14fd4a5d579022a4ea
---
M wmf-config/wikitech.php
1 file changed, 0 insertions(+), 3 deletions(-)

Approvals:
  BryanDavis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/wikitech.php b/wmf-config/wikitech.php
index b2c72e0..ba14da4 100644
--- a/wmf-config/wikitech.php
+++ b/wmf-config/wikitech.php
@@ -20,9 +20,6 @@
 
 unset( $wgSpecialPages['SMWAdmin'] );
 
-// Disable creation of new Forms on wikitech, we're moving away from this
-$wgNamespaceProtection[106] = 'nomorenewforms';
-
 $wgAPIModules['sfautocomplete'] = 'ApiDisabled';
 
 require_once( "$IP/extensions/LdapAuthentication/LdapAuthentication.php" );

-- 
To view, visit https://gerrit.wikimedia.org/r/352721
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9f2939285900492b7bc12b14fd4a5d579022a4ea
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Disable creation of new forms on wikitech"

2017-05-08 Thread BryanDavis (Code Review)

Hello Chad, Reedy, Brian Wolff, MaxSem, jenkins-bot,

I'd like you to do a code review.  Please visit

https://gerrit.wikimedia.org/r/352721

to review the following change.


Change subject: Revert "Disable creation of new forms on wikitech"
..

Revert "Disable creation of new forms on wikitech"

This reverts commit 8091876355a504974cdee7b185e4f124a56fb2c4.

Bug: T53642
Change-Id: I9f2939285900492b7bc12b14fd4a5d579022a4ea
---
M wmf-config/wikitech.php
1 file changed, 0 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/21/352721/1

diff --git a/wmf-config/wikitech.php b/wmf-config/wikitech.php
index 5e90fd8..d4e74d6 100644
--- a/wmf-config/wikitech.php
+++ b/wmf-config/wikitech.php
@@ -20,9 +20,6 @@
 
 unset( $wgSpecialPages['SMWAdmin'] );
 
-// Disable creation of new Forms on wikitech, we're moving away from this
-$wgNamespaceProtection[106] = 'nomorenewforms';
-
 require_once( "$IP/extensions/LdapAuthentication/LdapAuthentication.php" );
 $wgAuthManagerAutoConfig['primaryauth'] += [
LdapPrimaryAuthenticationProvider::class => [

-- 
To view, visit https://gerrit.wikimedia.org/r/352721
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f2939285900492b7bc12b14fd4a5d579022a4ea
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Allow to explicitly index archive when given option.

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352718 )

Change subject: Allow to explicitly index archive when given option.
..


Allow to explicitly index archive when given option.

Now it should work this way:
--deletes indexes deletes and if enabled by option, indexes archive too.
--archive indexes only archive regardless of the option.

This allows to pre-index deletes for a wiki before enabling it in config
(which requires mapping already being there).

Change-Id: I6bf8edc2fc91f8af03d2dfdfbe3dbdee73c03d4e
---
M includes/Updater.php
M maintenance/forceSearchIndex.php
2 files changed, 16 insertions(+), 11 deletions(-)

Approvals:
  EBernhardson: Looks good to me, approved
  Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/Updater.php b/includes/Updater.php
index 8758245..ba8ba34 100644
--- a/includes/Updater.php
+++ b/includes/Updater.php
@@ -258,10 +258,11 @@
/**
 * Add documents to archive index.
 * @param array $archived
+* @param bool $forceIndex If true, index to archive regardless of 
config.
 * @return bool
 */
-   public function archivePages( $archived ) {
-   if ( !$this->searchConfig->getElement( 
'CirrusSearchIndexDeletes' ) ) {
+   public function archivePages( $archived, $forceIndex = false ) {
+   if ( !$this->searchConfig->getElement( 
'CirrusSearchIndexDeletes' ) && !$forceIndex ) {
// Disabled by config - don't do anything
return true;
}
diff --git a/maintenance/forceSearchIndex.php b/maintenance/forceSearchIndex.php
index d53404f..dae8a9b 100644
--- a/maintenance/forceSearchIndex.php
+++ b/maintenance/forceSearchIndex.php
@@ -46,7 +46,7 @@
public $toDate = null;
public $toId = null;
public $indexUpdates;
-   public $archiveOnly;
+   public $archive;
public $limit;
public $queue;
public $maxJobs;
@@ -80,7 +80,7 @@
$this->addOption( 'toId', 'Stop indexing at a specific page_id. 
 Not useful with --deletes or --from or --to.', false, true );
$this->addOption( 'ids', 'List of page ids (comma separated) to 
reindex. Not allowed with deletes/from/to/fromId/toId/limit.', false, true );
$this->addOption( 'deletes', 'If this is set then just index 
deletes, not updates or creates.', false );
-   $this->addOption( 'archiveOnly', 'Don\'t delete pages, only 
index them into the archive. Only useful with --deletes', false, false );
+   $this->addOption( 'archive', 'Don\'t delete pages, only index 
them into the archive.', false, false );
$this->addOption( 'limit', 'Maximum number of pages to process 
before exiting the script. Default to unlimited.', false, true );
$this->addOption( 'buildChunks', 'Instead of running the script 
spit out commands that can be farmed out to ' .
'different processes or machines to rebuild the index.  
Works with fromId and toId, not from and to.  ' .
@@ -130,7 +130,11 @@
}
$this->toId = $this->getOption( 'toId' );
$this->indexUpdates = !$this->getOption( 'deletes', false );
-   $this->archiveOnly = (bool) $this->getOption( 'archiveOnly', 
false );
+   $this->archive = (bool) $this->getOption( 'archive', false );
+   if ( $this->archive ) {
+   // If we're indexing only for archive, this implies 
deletes
+   $this->indexUpdates = false;
+   }
$this->limit = $this->getOption( 'limit' );
$buildChunks = $this->getOption( 'buildChunks' );
if ( $buildChunks !== null ) {
@@ -144,7 +148,7 @@
$updateFlags = $this->buildUpdateFlags();
 
if ( !$this->getOption( 'batch-size' ) &&
-   ( $this->getOption( 'queue' ) || $this->getOption( 
'deletes' ) )
+   ( $this->getOption( 'queue' ) || !$this->indexUpdates )
) {
$this->setBatchSize( 100 );
}
@@ -159,7 +163,7 @@
 
$operationName = $this->indexUpdates
? ( $this->queue ? 'Queued' : 'Indexed' )
-   : 'Deleted';
+   : ( $this->archive ? 'Archived' : 'Deleted' );
 
$operationStartTime = microtime( true );
$completed = 0;
@@ -192,8 +196,8 @@
} else {
$size = count( $batch['titlesToDelete'] );
$updater = $this->createUpdater();
-   $updater->archivePages( $batch['archive'] );
-

[MediaWiki-commits] [Gerrit] labs...deploy[master]: Bump striker submodule

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352719 )

Change subject: Bump striker submodule
..


Bump striker submodule

Bug: T164787
Change-Id: I074ed1e9277aac3eec4565a6302e097d394fc73a
---
M striker
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  BryanDavis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/striker b/striker
index 2626365..f1cff98 16
--- a/striker
+++ b/striker
@@ -1 +1 @@
-Subproject commit 2626365d7e94d9f3979f034118da5f0823c4f36e
+Subproject commit f1cff989dcaea6ff6ba0ba99cffe82e61698cbe2

-- 
To view, visit https://gerrit.wikimedia.org/r/352719
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I074ed1e9277aac3eec4565a6302e097d394fc73a
Gerrit-PatchSet: 1
Gerrit-Project: labs/striker/deploy
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] labs...deploy[master]: Bump striker submodule

2017-05-08 Thread BryanDavis (Code Review)

BryanDavis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352719 )

Change subject: Bump striker submodule
..

Bump striker submodule

Bug: T164787
Change-Id: I074ed1e9277aac3eec4565a6302e097d394fc73a
---
M striker
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/striker/deploy 
refs/changes/19/352719/1

diff --git a/striker b/striker
index 2626365..f1cff98 16
--- a/striker
+++ b/striker
@@ -1 +1 @@
-Subproject commit 2626365d7e94d9f3979f034118da5f0823c4f36e
+Subproject commit f1cff989dcaea6ff6ba0ba99cffe82e61698cbe2

-- 
To view, visit https://gerrit.wikimedia.org/r/352719
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I074ed1e9277aac3eec4565a6302e097d394fc73a
Gerrit-PatchSet: 1
Gerrit-Project: labs/striker/deploy
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Assert valid transformations between formats in the http api

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352716 )

Change subject: Assert valid transformations between formats in the http api
..


Assert valid transformations between formats in the http api

Change-Id: Ib3baa70d90b6554bebe857478b22d1f168b58ed6
---
M lib/api/routes.js
1 file changed, 16 insertions(+), 16 deletions(-)

Approvals:
  Subramanya Sastry: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/api/routes.js b/lib/api/routes.js
index 289f007..580a5ab 100644
--- a/lib/api/routes.js
+++ b/lib/api/routes.js
@@ -53,12 +53,20 @@
next();
};
 
-   var supportedFormats = new Set(['pagebundle', 'html', 'wikitext']);
-
var errorEncoding = new Map(Object.entries({
'pagebundle': 'json',
'html': 'html',
'wikitext': 'plain',
+   }));
+
+   // NOTE: wt2wt here is not a transformation, it just fetches the page
+   // wikitext and is limited to GET requests.  The endpoint is used in
+   // roundtrip testing.
+
+   var validTransforms = new Map(Object.entries({
+   'wikitext': ['wikitext', 'html', 'pagebundle'],
+   'html': ['wikitext'],
+   'pagebundle': ['wikitext', 'pagebundle'],
}));
 
routes.v3Middle = function(req, res, next) {
@@ -79,15 +87,11 @@
format: req.params.format,
}, req.body);
 
-   if (!supportedFormats.has(opts.format)) {
-   res.locals.errorEnc = 'plain';
-   return errOut(res, 'Invalid format: ' + opts.from + 
'/to/' + opts.format);
-   } else {
-   res.locals.errorEnc = errorEncoding.get(opts.format);
-   }
+   res.locals.errorEnc = errorEncoding.get(opts.format) || 'plain';
 
-   if (!supportedFormats.has(opts.from)) {
-   return errOut(res, 'Invalid format: ' + opts.from + 
'/to/' + opts.format);
+   var transforms = validTransforms.get(opts.from);
+   if (transforms === undefined || 
!transforms.includes(opts.format)) {
+   return errOut(res, 'Invalid transform: ' + opts.from + 
'/to/' + opts.format);
}
 
var iwp = parsoidConfig.reverseMwApiMap.get(req.params.domain);
@@ -774,7 +778,7 @@
var env = res.locals.env;
var p;
if (opts.from === 'wikitext') {
-   // No use case for this yet
+   // No use case for this yet ... we only accept it with 
GET above.
if (opts.format === 'wikitext') {
return apiUtils.fatalRequest(env, 'Invalid 
format', 400);
}
@@ -792,7 +796,7 @@
return apiUtils.fatalRequest(env, 'No title or 
wikitext was provided.', 400);
}
p = wt2html(req, res, wikitext);
-   } else {  // from html/pagebundle
+   } else {  // from pagebundle
if (opts.format === 'wikitext') {
// html is required for serialization
if (opts.html === undefined) {
@@ -803,10 +807,6 @@
opts.html : (opts.html.body || '');
p = html2wt(req, res, html);
} else {
-   // No use case for this yet
-   if (opts.from === 'html' || opts.to === 'html') 
{
-   return apiUtils.fatalRequest(env, 
'Invalid to or from', 400);
-   }
p = pb2pb(req, res);
}
}

-- 
To view, visit https://gerrit.wikimedia.org/r/352716
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3baa70d90b6554bebe857478b22d1f168b58ed6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: nagios_common: move new icinga contacts to Hiera top-level (...

2017-05-08 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352717 )

Change subject: nagios_common: move new icinga contacts to Hiera top-level 
(debug)
..


nagios_common: move new icinga contacts to Hiera top-level (debug)

Change-Id: I69ba60719cc3e1949562bc93afd293f44f270dfc
---
M modules/nagios_common/templates/contacts-new.cfg.erb
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/nagios_common/templates/contacts-new.cfg.erb 
b/modules/nagios_common/templates/contacts-new.cfg.erb
index 006a765..231be6d 100644
--- a/modules/nagios_common/templates/contacts-new.cfg.erb
+++ b/modules/nagios_common/templates/contacts-new.cfg.erb
@@ -31,9 +31,9 @@
 service_notification_period PST_awake_hours
 host_notification_options   d,r,f
 service_notification_optionsc,r,f
-email   <%= 
scope.function_hiera(['icinga::contacts::dzahn::email']) %>
-pager   <%= 
scope.function_hiera(['icinga::contacts::dzahn::pager']) %>
-address1<%= 
scope.function_hiera(['icinga::contacts::dzahn::address1']) %>
+email   <%= 
scope.function_hiera(['icinga_contacts_dzahn_email']) %>
+pager   <%= 
scope.function_hiera(['icinga_contacts_dzahn_pager']) %>
+address1<%= 
scope.function_hiera(['icinga_contacts_dzahn_address1']) %>
 host_notification_commands  
host-notify-by-email,host-notify-by-sms-gateway
 service_notification_commands   notify-by-email,notify-by-sms-gateway
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/352717
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I69ba60719cc3e1949562bc93afd293f44f270dfc
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Allow to explicitly index archive when given option.

2017-05-08 Thread Smalyshev (Code Review)

Smalyshev has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352718 )

Change subject: Allow to explicitly index archive when given option.
..

Allow to explicitly index archive when given option.

Now it should work this way:
--deletes indexes deletes and if enabled by option, indexes archive too.
--archive indexes only archive regardless of the option.

This allows to pre-index deletes for a wiki before enabling it in config
(which requires mapping already being there).

Change-Id: I6bf8edc2fc91f8af03d2dfdfbe3dbdee73c03d4e
---
M includes/Updater.php
M maintenance/forceSearchIndex.php
2 files changed, 13 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/18/352718/1

diff --git a/includes/Updater.php b/includes/Updater.php
index 8758245..ba8ba34 100644
--- a/includes/Updater.php
+++ b/includes/Updater.php
@@ -258,10 +258,11 @@
/**
 * Add documents to archive index.
 * @param array $archived
+* @param bool $forceIndex If true, index to archive regardless of 
config.
 * @return bool
 */
-   public function archivePages( $archived ) {
-   if ( !$this->searchConfig->getElement( 
'CirrusSearchIndexDeletes' ) ) {
+   public function archivePages( $archived, $forceIndex = false ) {
+   if ( !$this->searchConfig->getElement( 
'CirrusSearchIndexDeletes' ) && !$forceIndex ) {
// Disabled by config - don't do anything
return true;
}
diff --git a/maintenance/forceSearchIndex.php b/maintenance/forceSearchIndex.php
index d53404f..057b221 100644
--- a/maintenance/forceSearchIndex.php
+++ b/maintenance/forceSearchIndex.php
@@ -80,7 +80,7 @@
$this->addOption( 'toId', 'Stop indexing at a specific page_id. 
 Not useful with --deletes or --from or --to.', false, true );
$this->addOption( 'ids', 'List of page ids (comma separated) to 
reindex. Not allowed with deletes/from/to/fromId/toId/limit.', false, true );
$this->addOption( 'deletes', 'If this is set then just index 
deletes, not updates or creates.', false );
-   $this->addOption( 'archiveOnly', 'Don\'t delete pages, only 
index them into the archive. Only useful with --deletes', false, false );
+   $this->addOption( 'archive', 'Don\'t delete pages, only index 
them into the archive.', false, false );
$this->addOption( 'limit', 'Maximum number of pages to process 
before exiting the script. Default to unlimited.', false, true );
$this->addOption( 'buildChunks', 'Instead of running the script 
spit out commands that can be farmed out to ' .
'different processes or machines to rebuild the index.  
Works with fromId and toId, not from and to.  ' .
@@ -131,6 +131,10 @@
$this->toId = $this->getOption( 'toId' );
$this->indexUpdates = !$this->getOption( 'deletes', false );
$this->archiveOnly = (bool) $this->getOption( 'archiveOnly', 
false );
+   if ( $this->archiveOnly ) {
+   // If we're indexing only for archive, this implies 
deletes
+   $this->indexUpdates = false;
+   }
$this->limit = $this->getOption( 'limit' );
$buildChunks = $this->getOption( 'buildChunks' );
if ( $buildChunks !== null ) {
@@ -144,7 +148,8 @@
$updateFlags = $this->buildUpdateFlags();
 
if ( !$this->getOption( 'batch-size' ) &&
-   ( $this->getOption( 'queue' ) || $this->getOption( 
'deletes' ) )
+( $this->getOption( 'queue' ) || $this->getOption( 
'deletes' ) ||
+  $this->getOption( 'archive' ) )
) {
$this->setBatchSize( 100 );
}
@@ -192,7 +197,7 @@
} else {
$size = count( $batch['titlesToDelete'] );
$updater = $this->createUpdater();
-   $updater->archivePages( $batch['archive'] );
+   $updater->archivePages( $batch['archive'], 
$this->archiveOnly );
if ( !$this->archiveOnly ) {
$updater->deletePages( 
$batch['titlesToDelete'], $batch['docIdsToDelete'] );
}
@@ -214,7 +219,8 @@
private function buildPageIdBatches() {
if ( $this->getOption( 'deletes' ) || $this->hasOption( 'limit' 
)
|| $this->hasOption( 'from' ) || $this->hasOption( 'to' 
)
-   || $this->hasOption( 'fromId' ) || $this->hasOption( 
'toId' )
+   || $this->hasOption( 'fromId' )

[MediaWiki-commits] [Gerrit] operations/puppet[production]: nagios_common: move icinga contacts to Hiera top-level (debug)

2017-05-08 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352717 )

Change subject: nagios_common: move icinga contacts to Hiera top-level (debug)
..

nagios_common: move icinga contacts to Hiera top-level (debug)

Change-Id: I69ba60719cc3e1949562bc93afd293f44f270dfc
---
M modules/nagios_common/templates/contacts-new.cfg.erb
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/17/352717/1

diff --git a/modules/nagios_common/templates/contacts-new.cfg.erb 
b/modules/nagios_common/templates/contacts-new.cfg.erb
index 006a765..231be6d 100644
--- a/modules/nagios_common/templates/contacts-new.cfg.erb
+++ b/modules/nagios_common/templates/contacts-new.cfg.erb
@@ -31,9 +31,9 @@
 service_notification_period PST_awake_hours
 host_notification_options   d,r,f
 service_notification_optionsc,r,f
-email   <%= 
scope.function_hiera(['icinga::contacts::dzahn::email']) %>
-pager   <%= 
scope.function_hiera(['icinga::contacts::dzahn::pager']) %>
-address1<%= 
scope.function_hiera(['icinga::contacts::dzahn::address1']) %>
+email   <%= 
scope.function_hiera(['icinga_contacts_dzahn_email']) %>
+pager   <%= 
scope.function_hiera(['icinga_contacts_dzahn_pager']) %>
+address1<%= 
scope.function_hiera(['icinga_contacts_dzahn_address1']) %>
 host_notification_commands  
host-notify-by-email,host-notify-by-sms-gateway
 service_notification_commands   notify-by-email,notify-by-sms-gateway
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/352717
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I69ba60719cc3e1949562bc93afd293f44f270dfc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] labs/striker[master]: openstack: Role modifications require global admin rights

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352689 )

Change subject: openstack: Role modifications require global admin rights
..


openstack: Role modifications require global admin rights

Keystone hands out different authentication tokens depending on the
project that is used when authenticating. Some API actions require
`role:admin` or `is_admin:1` rights in the token. These can only be
acquired by authenticating via the `admin` project.

* Add ability to pass interface to _client()
* Add _admin_client() convenience method for getting a client for
  project=admin, interface=admin.
* Use _admin_client() for role add/remove API activities.
* Add missing `user` keyword specifier when calling role add/remove
  APIs.

Bug: T164787
Change-Id: Ia67b4fef0c915068c9a735098ef3a4083177c1c9
---
M striker/openstack.py
1 file changed, 13 insertions(+), 7 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/striker/openstack.py b/striker/openstack.py
index c7d4a70..6a20d02 100644
--- a/striker/openstack.py
+++ b/striker/openstack.py
@@ -62,20 +62,24 @@
 auth_url=self.url,
 password=self.password,
 username=self.username,
-project_id=project,
+project_name=project,
 user_domain_name='Default',
 project_domain_name='Default',
 )
 return keystone_session.Session(auth=auth)
 
 @functools.lru_cache(maxsize=None)
-def _client(self, project=None):
+def _client(self, project=None, interface='public'):
 project = project or self.project
 return client.Client(
 session=self._session(project),
-interface='public',
+interface=interface,
 timeoute=2,
 )
+
+def _admin_client(self):
+"""Convenience method for getting a client with super user rights."""
+return self._client(project='admin', interface='admin')
 
 def role(self, name):
 if self.roles is None:
@@ -85,10 +89,12 @@
 
 def grant_role(self, role, user, project=None):
 project = project or self.project
-keystone = self._client(project)
-keystone.roles.grant(self.role(role), user, project=project)
+# We need global admin rights to change role assignments
+keystone = self._admin_client()
+keystone.roles.grant(self.role(role), user=user, project=project)
 
 def revoke_role(self, role, user, project=None):
 project = project or self.project
-keystone = self._client(project)
-keystone.roles.revoke(role, user, project=project)
+# We need global admin rights to change role assignments
+keystone = self._admin_client()
+keystone.roles.revoke(role, user=user, project=project)

-- 
To view, visit https://gerrit.wikimedia.org/r/352689
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia67b4fef0c915068c9a735098ef3a4083177c1c9
Gerrit-PatchSet: 3
Gerrit-Project: labs/striker
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Rush 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Add note to keep scap server lists in sync with Linter mw-co...

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/345001 )

Change subject: Add note to keep scap server lists in sync with Linter mw-config
..


Add note to keep scap server lists in sync with Linter mw-config

Change-Id: Ic715f4da7411dcf0a0e234596fa9ca481b251300
---
M scap/target-canary
M scap/targets
2 files changed, 4 insertions(+), 0 deletions(-)

Approvals:
  Subramanya Sastry: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/scap/target-canary b/scap/target-canary
index c466180..5602d57 100644
--- a/scap/target-canary
+++ b/scap/target-canary
@@ -1,3 +1,5 @@
+# Changes to this list should also update
+# $wgLinterSubmitterWhitelist in operations/mediawiki-config
 wtp2001.codfw.wmnet
 wtp2002.codfw.wmnet
 wtp1001.eqiad.wmnet
diff --git a/scap/targets b/scap/targets
index 544c5c8..12934ef 100644
--- a/scap/targets
+++ b/scap/targets
@@ -1,3 +1,5 @@
+# Changes to this list should also update
+# $wgLinterSubmitterWhitelist in operations/mediawiki-config
 wtp1003.eqiad.wmnet
 wtp1004.eqiad.wmnet
 wtp1005.eqiad.wmnet

-- 
To view, visit https://gerrit.wikimedia.org/r/345001
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic715f4da7411dcf0a0e234596fa9ca481b251300
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Follow-up fa2efb9e5: Also mount the service in ApiVisualEdit...

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352712 )

Change subject: Follow-up fa2efb9e5: Also mount the service in 
ApiVisualEditorEdit
..


Follow-up fa2efb9e5: Also mount the service in ApiVisualEditorEdit

Whoops.

Change-Id: If1eac7fc745e8b21b47fbc6a8d40c3e45f4f52df
---
M ApiVisualEditorEdit.php
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Esanders: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/ApiVisualEditorEdit.php b/ApiVisualEditorEdit.php
index eb2a6dd..b97763f 100644
--- a/ApiVisualEditorEdit.php
+++ b/ApiVisualEditorEdit.php
@@ -253,6 +253,8 @@
}
 
public function execute() {
+   $this->serviceClient->mount( '/restbase/', 
$this->getVRSObject() );
+
$user = $this->getUser();
$params = $this->extractRequestParams();
$title = Title::newFromText( $params['page'] );

-- 
To view, visit https://gerrit.wikimedia.org/r/352712
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If1eac7fc745e8b21b47fbc6a8d40c3e45f4f52df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/debian[jessie]: Merge branch 'master' into jessie

2017-05-08 Thread Legoktm (Code Review)

Legoktm has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/351205 )

Change subject: Merge branch 'master' into jessie
..


Merge branch 'master' into jessie

Change-Id: I1eff6c3516951f1939ea2f9789ecb00729df53a5
---
M debian/changelog
1 file changed, 9 insertions(+), 5 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/debian/changelog b/debian/changelog
index e55b6d6..c762bed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,21 @@
-<<< HEAD   (a4db6b Merge tag 'debian/1%1.27.2-1' into jessie)
-mediawiki (1:1.27.2-1~bpo8+1) jessie-backports; urgency=medium
+mediawiki (1:1.27.3-1~bpo8+1) jessie-backports; urgency=medium
 
   * Rebuild for jessie-backports.
 
- -- Kunal Mehta   Sat, 08 Apr 2017 08:37:49 +
-===
+ -- Kunal Mehta   Mon, 01 May 2017 15:27:58 -0700
+
 mediawiki (1:1.27.3-1) unstable; urgency=medium
 
   * Imported Upstream version 1.27.3 (security release), that
 actually contains the fix for CVE-2017-0372 (Closes: #861585)
 
  -- Kunal Mehta   Mon, 01 May 2017 13:20:11 -0700
->>> BRANCH (234be1 Update changelog for 1.27.3)
+
+mediawiki (1:1.27.2-1~bpo8+1) jessie-backports; urgency=medium
+
+  * Rebuild for jessie-backports.
+
+ -- Kunal Mehta   Sat, 08 Apr 2017 08:37:49 +
 
 mediawiki (1:1.27.2-1) unstable; urgency=medium
 

-- 
To view, visit https://gerrit.wikimedia.org/r/351205
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1eff6c3516951f1939ea2f9789ecb00729df53a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: jessie
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Update VE core submodule to master (fbeb0db2c)

2017-05-08 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352713 )

Change subject: Update VE core submodule to master (fbeb0db2c)
..

Update VE core submodule to master (fbeb0db2c)

New changes:
d61440346 Add logging to the rebase server and client
d1d2539ae rebaser: Add script to convert a log file to a test case
0896d5f05 lib: Update README files for OOjs and OOjs UI
045ae87fb Localisation updates from https://translatewiki.net.
04b276e16 VisualDiff: Make annotation whitespace trimming configurable
dd04912e5 Localisation updates from https://translatewiki.net.
11fc30709 MobileContext: fix button spacing
7898acd0b Fix typos and minor lint issues
4e3e2deb9 Avoid using the global namespace in test files
1ed81efa1 build: Update eslint to 0.4.0 and make a pass

Bug: T163473
Bug: T164166
Change-Id: I4bab4260d6b05ff0277cacd167186336acc02080
---
M lib/ve
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/13/352713/1

diff --git a/lib/ve b/lib/ve
index 3b8a164..fbeb0db 16
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit 3b8a164a37ae9d5893a4998638b2e3dc2c92a41d
+Subproject commit fbeb0db2c2aec9f6d4caf035363af2b07e2ca946

-- 
To view, visit https://gerrit.wikimedia.org/r/352713
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4bab4260d6b05ff0277cacd167186336acc02080
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Add mw-parser-output class to Parsoid's output

2017-05-08 Thread Subramanya Sastry (Code Review)

Subramanya Sastry has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352711 )

Change subject: Add mw-parser-output class to Parsoid's output
..

Add mw-parser-output class to Parsoid's output

* Templates will target mw-parser-output
* Skins will target mw-body-content
* There is a large overlap between the targets of the
  two classes, but mw-body-content is also applied to
  interface elements not present in the parser output.

Bug: T37247
Bug: T164792
Change-Id: I05476df24f06a6b06f37a6a22d3e33ef4a939ef8
---
M lib/wt2html/DOMPostProcessor.js
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/11/352711/1

diff --git a/lib/wt2html/DOMPostProcessor.js b/lib/wt2html/DOMPostProcessor.js
index befb7c9..e9bb7ee 100644
--- a/lib/wt2html/DOMPostProcessor.js
+++ b/lib/wt2html/DOMPostProcessor.js
@@ -374,12 +374,15 @@
document.body.setAttribute('dir', dir);
 
// Set 'mw-body-content' directly on the body.
-   // This the designated successor for #bodyContent in core skins.
+   // This is the designated successor for #bodyContent in core skins.
document.body.classList.add('mw-body-content');
// Set 'parsoid-body' to add the desired layout styling from Vector.
document.body.classList.add('parsoid-body');
-   // Also, add the 'mediawiki' class.
+   // Also, add the 'mediawiki' class. (WHY? Document this)
document.body.classList.add('mediawiki');
+   // Set 'mw-parser-output' directly on the body.
+   // Templates target this class as part of the TemplateStyles RFC
+   document.body.classList.add('mw-parser-output');
 };
 
 DOMPostProcessor.prototype.doPostProcess = function(document) {

-- 
To view, visit https://gerrit.wikimedia.org/r/352711
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I05476df24f06a6b06f37a6a22d3e33ef4a939ef8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Gerrit: Remove "" around T\\d+ in gerrit.config

2017-05-08 Thread Paladox (Code Review)

Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352710 )

Change subject: Gerrit: Remove "" around T\\d+ in gerrit.config
..

Gerrit: Remove "" around T\\d+ in gerrit.config

Reason is when i did an update to gerrit 2.14 and ran puppet, i got this

-match = T\\d+
+match = "T\\d+"

Thats a puppet run so it added ""

Change-Id: If2c073e5f6bad030672f5eba88156844cdee9b6a
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/10/352710/1


-- 
To view, visit https://gerrit.wikimedia.org/r/352710
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If2c073e5f6bad030672f5eba88156844cdee9b6a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMaintenance[master]: Follow-up ba3cae5d887: deal with unserialize() returning false

2017-05-08 Thread Catrope (Code Review)

Catrope has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352709 )

Change subject: Follow-up ba3cae5d887: deal with unserialize() returning false
..

Follow-up ba3cae5d887: deal with unserialize() returning false

Change-Id: I5efdd81aa696ef8f7209980e909cb54c9e3ab9ef
---
M fixT159372.php
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMaintenance 
refs/changes/09/352709/1

diff --git a/fixT159372.php b/fixT159372.php
index 4c32d47..1d84145 100644
--- a/fixT159372.php
+++ b/fixT159372.php
@@ -36,7 +36,12 @@
foreach ( $iterator as $batch ) {
foreach ( $batch as $row ) {
try {
-   $reserialized = serialize( unserialize( 
$row->event_extra ) );
+   $unserialized = unserialize( 
$row->event_extra );
+   if ( !$unserialized ) {
+   $this->output( "Failed to 
unserialize event_id {$row->event_id}" );
+   continue;
+   }
+   $reserialized = serialize( 
$unserialized );
$dbw->update(
'echo_event',
[ 'event_extra' => 
$reserialized ],

-- 
To view, visit https://gerrit.wikimedia.org/r/352709
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5efdd81aa696ef8f7209980e909cb54c9e3ab9ef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMaintenance
Gerrit-Branch: master
Gerrit-Owner: Catrope 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update graphoid to 98bab81

2017-05-08 Thread Mobrovac (Code Review)

Mobrovac has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350796 )

Change subject: Update graphoid to 98bab81
..


Update graphoid to 98bab81

List of changes:
98bab81 Switched to npm-stored graph-shared, fix mapsnapshot
xxx Update node module dependencies

Change-Id: Ic2adb66de57c7ac8f738be8a8413ccc618720823
---
M node_modules/ajv/dist/ajv.bundle.js
M node_modules/ajv/dist/ajv.min.js
M node_modules/ajv/dist/ajv.min.js.map
M node_modules/ajv/dist/nodent.min.js
M node_modules/ajv/dist/regenerator.min.js
M node_modules/ajv/lib/ajv.d.ts
M node_modules/ajv/lib/compile/formats.js
M node_modules/ajv/lib/dot/custom.jst
M node_modules/ajv/lib/dot/validate.jst
M node_modules/ajv/lib/dotjs/anyOf.js
M node_modules/ajv/lib/dotjs/constant.js
M node_modules/ajv/lib/dotjs/custom.js
M node_modules/ajv/lib/dotjs/dependencies.js
M node_modules/ajv/lib/dotjs/enum.js
M node_modules/ajv/lib/dotjs/format.js
M node_modules/ajv/lib/dotjs/items.js
M node_modules/ajv/lib/dotjs/multipleOf.js
M node_modules/ajv/lib/dotjs/not.js
M node_modules/ajv/lib/dotjs/oneOf.js
M node_modules/ajv/lib/dotjs/pattern.js
M node_modules/ajv/lib/dotjs/patternRequired.js
M node_modules/ajv/lib/dotjs/properties.js
M node_modules/ajv/lib/dotjs/ref.js
M node_modules/ajv/lib/dotjs/required.js
M node_modules/ajv/lib/dotjs/switch.js
M node_modules/ajv/lib/dotjs/uniqueItems.js
M node_modules/ajv/lib/dotjs/validate.js
M node_modules/ajv/package.json
M node_modules/ajv/scripts/compile-dots.js
M node_modules/ajv/scripts/travis-gh-pages
M node_modules/brace-expansion/index.js
M node_modules/brace-expansion/package.json
M node_modules/buffer-shims/package.json
M node_modules/bunyan/bin/bunyan
M node_modules/bunyan/lib/bunyan.js
M node_modules/bunyan/package.json
M 
node_modules/canvas/build/Release/.deps/Release/obj.target/canvas/src/Canvas.o.d
M 
node_modules/canvas/build/Release/.deps/Release/obj.target/canvas/src/CanvasGradient.o.d
M 
node_modules/canvas/build/Release/.deps/Release/obj.target/canvas/src/CanvasPattern.o.d
M 
node_modules/canvas/build/Release/.deps/Release/obj.target/canvas/src/CanvasRenderingContext2d.o.d
M 
node_modules/canvas/build/Release/.deps/Release/obj.target/canvas/src/FontFace.o.d
M 
node_modules/canvas/build/Release/.deps/Release/obj.target/canvas/src/Image.o.d
M 
node_modules/canvas/build/Release/.deps/Release/obj.target/canvas/src/ImageData.o.d
M node_modules/canvas/build/Release/.deps/Release/obj.target/canvas/src/init.o.d
M node_modules/canvas/build/Release/canvas.node
M node_modules/canvas/build/Release/obj.target/canvas.node
M node_modules/canvas/build/Release/obj.target/canvas/src/Canvas.o
A node_modules/concat-stream/node_modules/string_decoder/.npmignore
A node_modules/concat-stream/node_modules/string_decoder/LICENSE
C node_modules/concat-stream/node_modules/string_decoder/index.js
A node_modules/concat-stream/node_modules/string_decoder/package.json
M node_modules/concat-stream/package.json
M node_modules/domain-validator/package.json
A node_modules/duplexer2/node_modules/string_decoder/.npmignore
A node_modules/duplexer2/node_modules/string_decoder/LICENSE
R node_modules/duplexer2/node_modules/string_decoder/index.js
A node_modules/duplexer2/node_modules/string_decoder/package.json
M node_modules/duplexer2/package.json
M node_modules/finalhandler/node_modules/debug/.npmignore
D node_modules/finalhandler/node_modules/debug/bower.json
M node_modules/finalhandler/node_modules/debug/component.json
M node_modules/finalhandler/node_modules/debug/package.json
M node_modules/finalhandler/node_modules/debug/src/debug.js
A node_modules/finalhandler/node_modules/ms/index.js
A node_modules/finalhandler/node_modules/ms/package.json
M node_modules/finalhandler/package.json
M node_modules/form-data/lib/form_data.js
M node_modules/form-data/package.json
M node_modules/getpass/package.json
D node_modules/graph-shared/package.json
M node_modules/hosted-git-info/index.js
M node_modules/hosted-git-info/package.json
M node_modules/hot-shots/package.json
M node_modules/js-yaml/dist/js-yaml.js
M node_modules/js-yaml/dist/js-yaml.min.js
M node_modules/js-yaml/lib/js-yaml/type/float.js
M node_modules/js-yaml/lib/js-yaml/type/int.js
M node_modules/js-yaml/package.json
M node_modules/kad/package.json
M node_modules/ms/package.json
R node_modules/mw-graph-shared/.npmignore
R node_modules/mw-graph-shared/.travis.yml
R node_modules/mw-graph-shared/LICENSE
A node_modules/mw-graph-shared/kartographer_props.sql
A node_modules/mw-graph-shared/package.json
R node_modules/mw-graph-shared/src/VegaWrapper.js
A node_modules/mw-graph-shared/test/manual.js
R node_modules/mw-graph-shared/test/testVegaWrapper.js
M node_modules/nan/nan.h
A node_modules/nan/nan_json.h
M node_modules/nan/package.json
D node_modules/normalize-package-data/.npmignore
D node_modules/normalize-package-data/.travis.yml
M node_modules/normalize-package-data/package.json
D

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update restbase to b6111f0

2017-05-08 Thread Mobrovac (Code Review)

Mobrovac has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352706 )

Change subject: Update restbase to b6111f0
..


Update restbase to b6111f0

List of changes:
b6111f0 Delete the deprecated mobile-text endpoint

Change-Id: Ie3fc2237864ad42d64decacb710aaabf8fef4079
---
M restbase
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved



diff --git a/restbase b/restbase
index d033c67..b6111f0 16
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit d033c67a47f7e3a74f2629d0d1944692b83262ca
+Subproject commit b6111f0be2e14f7d88d2fe5abccdeaee86d6bd1d

-- 
To view, visit https://gerrit.wikimedia.org/r/352706
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3fc2237864ad42d64decacb710aaabf8fef4079
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...GuidedTour[master]: Support providing custom text instead of using the default a...

2017-05-08 Thread Mattflaschen (Code Review)

Mattflaschen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352707 )

Change subject: Support providing custom text instead of using the default 
action icon
..

Support providing custom text instead of using the default action icon

Also support namemsg here.

Change-Id: I67988c149ae3c3521e4fe473f99ce0f76243f389
---
M modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
1 file changed, 19 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GuidedTour 
refs/changes/07/352707/1

diff --git a/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js 
b/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
index be33c80..0490351 100644
--- a/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
+++ b/modules/ext.guidedTour.lib/ext.guidedTour.lib.Step.js
@@ -171,8 +171,11 @@
};
 
/**
-* Gets a Guiders button specification, using the message for the 
provided type
-* (if no text is provided) and the provided callback.
+* Gets a Guiders button specification, using the message and icon for 
the provided
+* type (if no text is provided) and the provided callback.
+*
+* If a name or namemsg is provided, the icon will not be shown and the 
text will
+* be used.
 *
 * @private
 *
@@ -192,7 +195,8 @@
// button.action will be deleted with the delete 
operator later in the flow.
buttonAction = button.action,
buttonTypeClass = getButtonTypeClass( button ),
-   messageKeyMapping;
+   messageKeyMapping,
+   hasIcon;
 
messageKeyMapping = {
next: 'guidedtour-next-button',
@@ -201,9 +205,19 @@
end: 'guidedtour-okay-button'
};
 
-   if ( !button.name ) {
+   // TODO: Refactor how namemsg is handled, for code reuse.
+   if ( button.namemsg ) {
+   messageKey = button.namemsg;
+   button.name = mw.message( button.namemsg ).parse();
+   delete button.namemsg;
+   }
+
+   if ( button.name ) {
+   hasIcon = false;
+   } else {
messageKey = messageKeyMapping[button.action];
button.name = mw.message( messageKey ).parse();
+   hasIcon = true;
}
 
return {
@@ -226,7 +240,7 @@
html: {
'class': guiders._buttonClass + ' ' + 
actionButtonClass + ' ' + buttonTypeClass
},
-   hasIcon: true
+   hasIcon: hasIcon
};
};
 

-- 
To view, visit https://gerrit.wikimedia.org/r/352707
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I67988c149ae3c3521e4fe473f99ce0f76243f389
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GuidedTour
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: nagios_common: test contact template with private/hiera lookup

2017-05-08 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352269 )

Change subject: nagios_common: test contact template with private/hiera lookup
..


nagios_common: test contact template with private/hiera lookup

After introducing a structure for the secret parts of contact data
in private/hieradata this is the next step towards moving contacts.cfg
from private to public repo.

Adding a temp contacts-new file with some test data that lives next
to the real contacts file while leaving them completely untouched.

Change-Id: I40da8afe0c78c8f96de0773a5e84dbebb22d191a
---
M modules/nagios_common/manifests/contacts.pp
A modules/nagios_common/templates/contacts-new.cfg.erb
2 files changed, 50 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/nagios_common/manifests/contacts.pp 
b/modules/nagios_common/manifests/contacts.pp
index 9e2acb5..be4a235 100644
--- a/modules/nagios_common/manifests/contacts.pp
+++ b/modules/nagios_common/manifests/contacts.pp
@@ -59,5 +59,15 @@
 group   => $group,
 mode=> '0600', # Only $owner:$group can read/write
 }
+
+# This 'new' file exists only temp during careful transition of 
contacts
+# from private repo and is not actually included by Icinga. --dz 
20170505
+file { "${config_dir}/contacts-new.cfg":
+ensure  => $ensure,
+content => template('nagios_common/contacts-new.cfg.erb'),
+owner   => $owner,
+group   => $group,
+mode=> '0400',
+}
 }
 }
diff --git a/modules/nagios_common/templates/contacts-new.cfg.erb 
b/modules/nagios_common/templates/contacts-new.cfg.erb
new file mode 100644
index 000..006a765
--- /dev/null
+++ b/modules/nagios_common/templates/contacts-new.cfg.erb
@@ -0,0 +1,40 @@
+# vim: autoindent ts=8
+
+define contact{
+contact_nameirc
+alias   wikimedia-tech
+host_notification_period24x7
+service_notification_period 24x7
+host_notification_options   d,r,f
+service_notification_optionsc,r,f
+email   nowhere
+host_notification_commands  notify-host-by-irc
+service_notification_commands   notify-service-by-irc
+}
+
+define contact{
+contact_nameirc-wikidata
+alias   wikidata-irc-bot
+host_notification_period24x7
+service_notification_period 24x7
+host_notification_options   d,r,f
+service_notification_optionsc,r,f
+email   nowhere
+host_notification_commands  notify-host-by-irc-wikidata
+service_notification_commands   notify-service-by-irc-wikidata
+}
+
+define contact{
+contact_namedzahn
+alias   daniel_zahn
+host_notification_periodPST_awake_hours
+service_notification_period PST_awake_hours
+host_notification_options   d,r,f
+service_notification_optionsc,r,f
+email   <%= 
scope.function_hiera(['icinga::contacts::dzahn::email']) %>
+pager   <%= 
scope.function_hiera(['icinga::contacts::dzahn::pager']) %>
+address1<%= 
scope.function_hiera(['icinga::contacts::dzahn::address1']) %>
+host_notification_commands  
host-notify-by-email,host-notify-by-sms-gateway
+service_notification_commands   notify-by-email,notify-by-sms-gateway
+}
+

-- 
To view, visit https://gerrit.wikimedia.org/r/352269
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I40da8afe0c78c8f96de0773a5e84dbebb22d191a
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...MobileApp[master]: Center elements in Parsoid HTML

2017-05-08 Thread Mholloway (Code Review)

Mholloway has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352686 )

Change subject: Center  elements in Parsoid HTML
..

Center  elements in Parsoid HTML

Bug: T164522
Change-Id: I90c82bb6e019e7f9a2e91ee075722a5b5699100d
---
M styles/android/parsoid.less
1 file changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileApp 
refs/changes/86/352686/1

diff --git a/styles/android/parsoid.less b/styles/android/parsoid.less
index fa09f88..c9bf382 100644
--- a/styles/android/parsoid.less
+++ b/styles/android/parsoid.less
@@ -7,7 +7,7 @@
-webkit-margin-start: 0 !important;
-webkit-margin-end: 0 !important;
 
-   img {
+   img,video {
margin: 0.6em auto 0.6em auto;
display: block;
clear: both;
@@ -22,5 +22,3 @@
color: #555;
width: auto !important;
 }
-
-// See also the figcaption rules in widenImages.less

-- 
To view, visit https://gerrit.wikimedia.org/r/352686
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I90c82bb6e019e7f9a2e91ee075722a5b5699100d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileApp
Gerrit-Branch: master
Gerrit-Owner: Mholloway 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: QA: Test renderer#show

2017-05-08 Thread Bmansurov (Code Review)

Bmansurov has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352681 )

Change subject: QA: Test renderer#show
..

QA: Test renderer#show

Binding the behavior has been left out as it requires some refactoring.
Ideally, that functionality should be tested via integration tests, which
is already done.

Bug: T133022
Change-Id: If2fd472847eb3557de97c7ec9619e8831e9bda6d
---
M resources/dist/index.js
M resources/dist/index.js.map
M src/renderer.js
M tests/node-qunit/renderer.js
4 files changed, 124 insertions(+), 49 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups 
refs/changes/81/352681/1


-- 
To view, visit https://gerrit.wikimedia.org/r/352681
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If2fd472847eb3557de97c7ec9619e8831e9bda6d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Bmansurov 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Upgrade tree differ to support timeouts, and handle them

2017-05-08 Thread Esanders (Code Review)

Esanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352669 )

Change subject: Upgrade tree differ to support timeouts, and handle them
..

Upgrade tree differ to support timeouts, and handle them

Bug: T164724
Change-Id: I6512203fb37725a2da7899b4f88b8a55042b0b66
---
M lib/treeDiffer/treeDiffer-dist.js
M src/dm/ve.dm.VisualDiff.js
2 files changed, 16 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/69/352669/1

diff --git a/lib/treeDiffer/treeDiffer-dist.js 
b/lib/treeDiffer/treeDiffer-dist.js
index 0333ed3..ec6b20a 100644
--- a/lib/treeDiffer/treeDiffer-dist.js
+++ b/lib/treeDiffer/treeDiffer-dist.js
@@ -189,10 +189,13 @@
  * @constructor
  * @param {treeDiffer.Tree} tree1 First tree
  * @param {treeDiffer.Tree} tree2 Second tree
+ * @param {Number} [timeout=1000] Timeout after which to stop diffing
  */
-treeDiffer.Differ = function ( tree1, tree2 ) {
+treeDiffer.Differ = function ( tree1, tree2, timeout ) {
var i, ilen, j, jlen, transactions,
transactionIndex = 0;
+
+   this.endTime = new Date().getTime() + ( timeout || 1000 );
 
this.tree1 = tree1;
this.tree2 = tree2;
@@ -295,6 +298,10 @@
 
// Get the diff
this.findMinimumTransactions( keyRoot1, keyRoot2, 
iNulls, jNulls, transactions );
+
+   if ( new Date().getTime() < this.endTime ) {
+   return;
+   }
}
}
 
diff --git a/src/dm/ve.dm.VisualDiff.js b/src/dm/ve.dm.VisualDiff.js
index 534faca..750d112 100644
--- a/src/dm/ve.dm.VisualDiff.js
+++ b/src/dm/ve.dm.VisualDiff.js
@@ -255,6 +255,14 @@
// tags for each child node
keepLength = oldDocChild.length - 2 * ( 
oldDocChildTree.orderedNodes.length - 1 );
 
+   // Tree diff timed out: record as full remove and insert
+   if ( !treeDiff ) {
+   treeDiff = [];
+   linearDiff = null;
+   diffLength = oldDocChild.length + newDocChild.length;
+   keepLength = 0;
+   }
+
for ( i = 0, ilen = treeDiff.length; i < ilen; i++ ) {
 
removeLength = 0;

-- 
To view, visit https://gerrit.wikimedia.org/r/352669
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6512203fb37725a2da7899b4f88b8a55042b0b66
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: kibana - cleanup of /opt/kibana has been done

2017-05-08 Thread Gehel (Code Review)

Gehel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352666 )

Change subject: kibana - cleanup of /opt/kibana has been done
..

kibana - cleanup of /opt/kibana has been done

Bug: T161908
Change-Id: I596ce48a38ff59e5d29498854a3314b738fd8b6f
---
M modules/kibana/manifests/init.pp
1 file changed, 0 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/66/352666/1

diff --git a/modules/kibana/manifests/init.pp b/modules/kibana/manifests/init.pp
index 695a883..59597a0 100644
--- a/modules/kibana/manifests/init.pp
+++ b/modules/kibana/manifests/init.pp
@@ -38,10 +38,4 @@
 File['/etc/kibana/kibana.yml'],
 ],
 }
-
-# kibana 4.x deployment. With 5.x things are
-# installed normally and not in /opt
-file { '/opt/kibana':
-ensure => absent
-}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/352666
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I596ce48a38ff59e5d29498854a3314b738fd8b6f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...IndexFunction[master]: Add IndexFunction.alias.php translation for Bengali (bn)

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352618 )

Change subject: Add IndexFunction.alias.php translation for Bengali (bn)
..


Add IndexFunction.alias.php translation for Bengali (bn)

Change-Id: I6b43f79ddeef6ae1d3a20a76764337e06025d737
---
M IndexFunction.alias.php
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, approved



diff --git a/IndexFunction.alias.php b/IndexFunction.alias.php
index d64b853..dbe57ab 100644
--- a/IndexFunction.alias.php
+++ b/IndexFunction.alias.php
@@ -44,6 +44,11 @@
'Index' => array( 'نمایگ' ),
 );
 
+/** Bengali (বাংলা) */
+$specialPageAliases['bn'] = array(
+   'Index' => array( 'নির্ঘণ্ট' ),
+);
+
 /** Breton (brezhoneg) */
 $specialPageAliases['br'] = array(
'Index' => array( 'Meneger' ),

-- 
To view, visit https://gerrit.wikimedia.org/r/352618
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b43f79ddeef6ae1d3a20a76764337e06025d737
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/IndexFunction
Gerrit-Branch: master
Gerrit-Owner: Aftab 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/debian[xenial]: Merge branch 'master' into xenial

2017-05-08 Thread Legoktm (Code Review)

Legoktm has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/351206 )

Change subject: Merge branch 'master' into xenial
..


Merge branch 'master' into xenial

Change-Id: I6fc7227c020ac824f294894ebe7b5707868be97c
---
M debian/changelog
1 file changed, 9 insertions(+), 5 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/debian/changelog b/debian/changelog
index 36d3cd4..fbf8104 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,21 @@
-<<< HEAD   (93689b Merge tag 'debian/1%1.27.2-1' into xenial)
-mediawiki (1:1.27.2-1ppa1~xenial1) xenial; urgency=medium
+mediawiki (1:1.27.3-1ppa1~xenial1) xenial; urgency=medium
 
   * Rebuild for xenial
 
- -- Kunal Mehta   Sat, 08 Apr 2017 13:29:11 -0700
-===
+ -- Kunal Mehta   Mon, 01 May 2017 15:32:31 -0700
+
 mediawiki (1:1.27.3-1) unstable; urgency=medium
 
   * Imported Upstream version 1.27.3 (security release), that
 actually contains the fix for CVE-2017-0372 (Closes: #861585)
 
  -- Kunal Mehta   Mon, 01 May 2017 13:20:11 -0700
->>> BRANCH (234be1 Update changelog for 1.27.3)
+
+mediawiki (1:1.27.2-1ppa1~xenial1) xenial; urgency=medium
+
+  * Rebuild for xenial
+
+ -- Kunal Mehta   Sat, 08 Apr 2017 13:29:11 -0700
 
 mediawiki (1:1.27.2-1) unstable; urgency=medium
 

-- 
To view, visit https://gerrit.wikimedia.org/r/351206
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6fc7227c020ac824f294894ebe7b5707868be97c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: xenial
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Update elk stack to 5.x

2017-05-08 Thread Gehel (Code Review)

Gehel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/344965 )

Change subject: Update elk stack to 5.x
..


Update elk stack to 5.x

* Upgrades elasticsearch to 5.1.2
* Upgrades kibana to 5.1.2
* Uses experimental wikimedia apt repository for all logstash nodes
  to access new versions of kibana and elasticsearch packages
* Updates templates used for logstash for compatability with es 5.x
** index is now a boolean, instead of analyzed/not_analyzed/no. New
   settings are basically: analyzed => type: text index: true,
   not_analyzed => type:keyword index:true, no => index:false
* updates logstash_checker.py to not use filtered queries which were
  removed in elasticsearch 5.x. Also reformats as "standard" json
  format and sets size to 0 since we only need the aggregation results.

Bug: T154473
Change-Id: I5ee2ace057ef9a7398d7c896fa513fb292050929
---
M hieradata/role/common/logstash/collector.yaml
M modules/kibana/manifests/init.pp
M modules/role/files/logstash/apifeatureusage-template.json
M modules/role/files/logstash/elasticsearch-template.json
M modules/service/files/logstash_checker.py
5 files changed, 130 insertions(+), 163 deletions(-)

Approvals:
  jenkins-bot: Verified
  Gehel: Looks good to me, approved



diff --git a/hieradata/role/common/logstash/collector.yaml 
b/hieradata/role/common/logstash/collector.yaml
index 4bbcc51..20ef97f 100644
--- a/hieradata/role/common/logstash/collector.yaml
+++ b/hieradata/role/common/logstash/collector.yaml
@@ -56,4 +56,3 @@
 debdeploy::grains:
   debdeploy-logstash:
 value: standard
-
diff --git a/modules/kibana/manifests/init.pp b/modules/kibana/manifests/init.pp
index 9eebac6..695a883 100644
--- a/modules/kibana/manifests/init.pp
+++ b/modules/kibana/manifests/init.pp
@@ -18,8 +18,7 @@
 ) {
 require_package('kibana')
 
-# kibana 4
-file { '/opt/kibana/config/kibana.yml':
+file { '/etc/kibana/kibana.yml':
 ensure  => file,
 owner   => 'root',
 group   => 'root',
@@ -36,7 +35,13 @@
 enable  => true,
 require => [
 Package['kibana'],
-File['/opt/kibana/config/kibana.yml'],
+File['/etc/kibana/kibana.yml'],
 ],
 }
+
+# kibana 4.x deployment. With 5.x things are
+# installed normally and not in /opt
+file { '/opt/kibana':
+ensure => absent
+}
 }
diff --git a/modules/role/files/logstash/apifeatureusage-template.json 
b/modules/role/files/logstash/apifeatureusage-template.json
index 2228152..37fd1dd 100644
--- a/modules/role/files/logstash/apifeatureusage-template.json
+++ b/modules/role/files/logstash/apifeatureusage-template.json
@@ -21,15 +21,15 @@
   "match" : "*",
   "match_mapping_type" : "string",
   "mapping" : {
-"index" : "no"
+"index" : false
   }
 }
   } ],
   "properties" : {
-"@timestamp" : { "type" : "date", "index" : "not_analyzed" },
-"@version" : { "type" : "string", "index" : "not_analyzed" },
-"feature" : { "type" : "string", "index" : "not_analyzed" },
-"agent" : { "type" : "string", "index" : "not_analyzed" }
+"@timestamp" : { "type" : "date", "index" : true },
+"@version" : { "type" : "keyword", "index" : true },
+"feature" : { "type" : "keyword", "index" :  true },
+"agent" : { "type" : "keyword", "index" : true }
   }
 }
   }
diff --git a/modules/role/files/logstash/elasticsearch-template.json 
b/modules/role/files/logstash/elasticsearch-template.json
index 21e909f..d9a7145 100644
--- a/modules/role/files/logstash/elasticsearch-template.json
+++ b/modules/role/files/logstash/elasticsearch-template.json
@@ -3,7 +3,6 @@
   "settings" : {
 "number_of_shards" : 1,
 "number_of_replicas" : 2,
-"index.cache.field.type" : "soft",
 "index.refresh_interval" : "5s",
 "analysis" : {
   "analyzer" : {
@@ -26,19 +25,15 @@
 {
   "string_fields" : {
 "match" : "*",
-"match_mapping_type" : "string",
+"match_mapping_type" : "text",
 "mapping" : {
-  "type" : "multi_field",
+  "type" : "text",
+  "index" : true,
+  "omit_norms" : true,
   "fields" : {
-"{name}" : {
-  "type" : "string",
-  "index" : "analyzed",
-  "omit_norms" : true
-},
 "raw" : {
-  "type" : "string",
-  "index" : "not_analyzed",
-  "ignore_above" : 256,
+  "type" : "keyword",
+  "index" : true,
   "doc_values": true
 }
   }
@@ -49,20 +44,9 @@
   "boolean_to_string" : {
 "match_mapping_type" : "boolean",
 "mapping" : {
-

[MediaWiki-commits] [Gerrit] operations/puppet[production]: ocg: use logrotate::conf for logrotate

2017-05-08 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352664 )

Change subject: ocg: use logrotate::conf for logrotate
..

ocg: use logrotate::conf for logrotate

Change-Id: I9dc445f9f37be5d047a2acbeda531e7c2fd8ee2c
---
M modules/ocg/manifests/init.pp
1 file changed, 1 insertion(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/64/352664/1

diff --git a/modules/ocg/manifests/init.pp b/modules/ocg/manifests/init.pp
index a56eee0..06bac51 100644
--- a/modules/ocg/manifests/init.pp
+++ b/modules/ocg/manifests/init.pp
@@ -220,12 +220,9 @@
 }
 }
 
-file { '/etc/logrotate.d/ocg':
+logrotate::conf { 'ocg':
 ensure => present,
 source => 'puppet:///modules/ocg/logrotate',
-mode   => '0444',
-owner  => 'root',
-group  => 'root',
 }
 
 # run logrotate hourly, instead of daily, to ensure that log size

-- 
To view, visit https://gerrit.wikimedia.org/r/352664
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9dc445f9f37be5d047a2acbeda531e7c2fd8ee2c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: profile::base: use logrotate::conf for logrotate

2017-05-08 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352661 )

Change subject: profile::base: use logrotate::conf for logrotate
..

profile::base: use logrotate::conf for logrotate

Change-Id: I264ec3699acc3f83fdf1d6c6ff7d925eaca696f2
---
M modules/profile/manifests/base.pp
1 file changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/61/352661/1

diff --git a/modules/profile/manifests/base.pp 
b/modules/profile/manifests/base.pp
index 009ddd4..6b02dc4 100644
--- a/modules/profile/manifests/base.pp
+++ b/modules/profile/manifests/base.pp
@@ -101,10 +101,8 @@
 }
 
 if os_version('ubuntu == trusty') {
-file { '/etc/logrotate.d/upstart':
-mode   => '0444',
-owner  => 'root',
-group  => 'root',
+logrotate::conf { 'upstart':
+ensure => present,
 source => 'puppet:///modules/base/logrotate/upstart',
 }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/352661
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I264ec3699acc3f83fdf1d6c6ff7d925eaca696f2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: dynamicproxy: use logrotate::conf for logrotate

2017-05-08 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352660 )

Change subject: dynamicproxy: use logrotate::conf for logrotate
..

dynamicproxy: use logrotate::conf for logrotate

Change-Id: I80c36606536463af15e6814dc07e90e1c21cc8c1
---
M modules/dynamicproxy/manifests/init.pp
1 file changed, 1 insertion(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/60/352660/1

diff --git a/modules/dynamicproxy/manifests/init.pp 
b/modules/dynamicproxy/manifests/init.pp
index 09c4ae6..adfdfe4 100644
--- a/modules/dynamicproxy/manifests/init.pp
+++ b/modules/dynamicproxy/manifests/init.pp
@@ -64,11 +64,8 @@
 variant => 'extras',
 }
 
-file { '/etc/logrotate.d/nginx':
+logrotate::conf { 'nginx':
 ensure => present,
-owner  => 'root',
-group  => 'root',
-mode   => '0444',
 source => 'puppet:///modules/dynamicproxy/logrotate',
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/352660
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I80c36606536463af15e6814dc07e90e1c21cc8c1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: snapshot: use logrotate::conf for logrotate

2017-05-08 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352657 )

Change subject: snapshot: use logrotate::conf for logrotate
..

snapshot: use logrotate::conf for logrotate

Change-Id: I6e281faa6bb169d0fbe4bd87674d5214d16971b2
---
M modules/snapshot/manifests/cron/cirrussearch.pp
1 file changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/57/352657/1

diff --git a/modules/snapshot/manifests/cron/cirrussearch.pp 
b/modules/snapshot/manifests/cron/cirrussearch.pp
index 075564a..5c9beb6 100644
--- a/modules/snapshot/manifests/cron/cirrussearch.pp
+++ b/modules/snapshot/manifests/cron/cirrussearch.pp
@@ -9,10 +9,8 @@
 owner  => $user,
 }
 
-file { '/etc/logrotate.d/cirrusdump':
-mode   => '0444',
-owner  => 'root',
-group  => 'root',
+logrotate::conf { 'cirrusdump':
+ensure => present,
 source => 'puppet:///modules/snapshot/cron/logrotate.cirrusdump',
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/352657
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e281faa6bb169d0fbe4bd87674d5214d16971b2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: elasticsearch - do not define gelf appender if it is unused

2017-05-08 Thread Gehel (Code Review)

Gehel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352655 )

Change subject: elasticsearch - do not define gelf appender if it is unused
..


elasticsearch - do not define gelf appender if it is unused

just defining the appender, even if unused, will make elasticsearch try to
load the gelf plugin, which might not be available if we do not want to
activate gelf.

Change-Id: I43f22df455f1aacaa271029013eb7032b202d793
---
M modules/elasticsearch/templates/log4j2.properties.erb
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  EBernhardson: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Gehel: Looks good to me, approved



diff --git a/modules/elasticsearch/templates/log4j2.properties.erb 
b/modules/elasticsearch/templates/log4j2.properties.erb
index 0799c0c..79ad21d 100644
--- a/modules/elasticsearch/templates/log4j2.properties.erb
+++ b/modules/elasticsearch/templates/log4j2.properties.erb
@@ -58,6 +58,7 @@
 appender.index_indexing_slow_log_file.layout.type = PatternLayout
 appender.index_indexing_slow_log_file.layout.pattern = 
[%d{ISO8601}][%-5p][%-25c] %m%n
 
+<% if @send_logs_to_logstash %>
 # ship_to_logstash needs to also be added to rootLogger to actually ship logs
 appender.ship_to_logstash.name = ship_to_logstash
 appender.ship_to_logstash.type = Gelf
@@ -66,3 +67,4 @@
 appender.ship_to_logstash.originHost = <%= @hostname %>
 appender.ship_to_logstash.facility = elasticsearch
 appender.ship_to_logstash.extractStackTrace = true
+<% end %>

-- 
To view, visit https://gerrit.wikimedia.org/r/352655
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I43f22df455f1aacaa271029013eb7032b202d793
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: rsyslog: use logrotate::conf for logrotate

2017-05-08 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352656 )

Change subject: rsyslog: use logrotate::conf for logrotate
..

rsyslog: use logrotate::conf for logrotate

Change-Id: I14a50980be6b1f55f78727a71a92db0f589b410a
---
M modules/rsyslog/manifests/receiver.pp
1 file changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/56/352656/1

diff --git a/modules/rsyslog/manifests/receiver.pp 
b/modules/rsyslog/manifests/receiver.pp
index d4b8a86..988e257 100644
--- a/modules/rsyslog/manifests/receiver.pp
+++ b/modules/rsyslog/manifests/receiver.pp
@@ -34,10 +34,8 @@
 priority => 10,
 }
 
-file { '/etc/logrotate.d/rsyslog_receiver':
-owner   => 'root',
-group   => 'root',
-mode=> '0444',
+logrotate::conf { 'rsyslog_receiver':
+ensure  => present,
 content => template("${module_name}/receiver_logrotate.erb.conf"),
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/352656
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I14a50980be6b1f55f78727a71a92db0f589b410a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: base::puppet: use logrotate::conf for logrotate

2017-05-08 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352654 )

Change subject: base::puppet: use logrotate::conf for logrotate
..

base::puppet: use logrotate::conf for logrotate

Change-Id: I5309634edd99ec662c4c8c3dfbb051d5e2623da9
---
M modules/base/manifests/puppet.pp
1 file changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/54/352654/1

diff --git a/modules/base/manifests/puppet.pp b/modules/base/manifests/puppet.pp
index 858112f..b3cbef2 100644
--- a/modules/base/manifests/puppet.pp
+++ b/modules/base/manifests/puppet.pp
@@ -130,10 +130,8 @@
 require => File['/usr/local/sbin/puppet-run'],
 }
 
-file { '/etc/logrotate.d/puppet':
-mode   => '0444',
-owner  => 'root',
-group  => 'root',
+logrotate::conf { 'puppet':
+ensure => present,
 source => 'puppet:///modules/base/logrotate/puppet',
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/352654
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5309634edd99ec662c4c8c3dfbb051d5e2623da9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Add role for 'CodeMirror' extension

2017-05-08 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352650 )

Change subject: Add role for 'CodeMirror' extension
..

Add role for 'CodeMirror' extension

Change-Id: Id2141297d7226a345132419d743d63132c31b164
---
A puppet/modules/role/manifests/codemirror.pp
1 file changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/50/352650/1

diff --git a/puppet/modules/role/manifests/codemirror.pp 
b/puppet/modules/role/manifests/codemirror.pp
new file mode 100644
index 000..1db411f
--- /dev/null
+++ b/puppet/modules/role/manifests/codemirror.pp
@@ -0,0 +1,9 @@
+# == Class: role::codemirror
+# The CodeMirror extension extension provides syntax highlighting in 
WikiEditor and VisualEditor's
+# wikitext mode.
+class role::codemirror {
+include ::role::wikieditor
+include ::role::visualeditor
+
+mediawiki::extension { 'CodeMirror': }
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/352650
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id2141297d7226a345132419d743d63132c31b164
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Jforrester 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: logstash upgrade to elasticsearch 5

2017-05-08 Thread Gehel (Code Review)

Gehel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352648 )

Change subject: logstash upgrade to elasticsearch 5
..


logstash upgrade to elasticsearch 5

Bug: T161908
Change-Id: Ia2fa08f9c54d09853fd688d85e6afea9905216c5
---
M hieradata/role/common/logstash/collector.yaml
M hieradata/role/common/logstash/elasticsearch.yaml
2 files changed, 0 insertions(+), 2 deletions(-)

Approvals:
  EBernhardson: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Gehel: Looks good to me, approved



diff --git a/hieradata/role/common/logstash/collector.yaml 
b/hieradata/role/common/logstash/collector.yaml
index 52945eb..4bbcc51 100644
--- a/hieradata/role/common/logstash/collector.yaml
+++ b/hieradata/role/common/logstash/collector.yaml
@@ -6,7 +6,6 @@
 # ES-specific
 # NOTE: cluster_name must be kept in sync with the backend
 # node config in hieradata/role/common/logstash/elasticsearch.yaml
-elasticsearch::version: 2
 elasticsearch::auto_create_index: true
 elasticsearch::cluster_name: production-logstash-eqiad
 elasticsearch::expected_nodes: 3
diff --git a/hieradata/role/common/logstash/elasticsearch.yaml 
b/hieradata/role/common/logstash/elasticsearch.yaml
index 31b78fa..7542f99 100644
--- a/hieradata/role/common/logstash/elasticsearch.yaml
+++ b/hieradata/role/common/logstash/elasticsearch.yaml
@@ -7,7 +7,6 @@
 # ES-specific
 # NOTE: cluster_name must be kept in sync with the backend
 # node config in hieradata/role/common/logstash.yaml
-elasticsearch::version: 2
 elasticsearch::auto_create_index: true
 elasticsearch::cluster_name: production-logstash-eqiad
 elasticsearch::expected_nodes: 3

-- 
To view, visit https://gerrit.wikimedia.org/r/352648
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2fa08f9c54d09853fd688d85e6afea9905216c5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: logstash upgrade to elasticsearch 5

2017-05-08 Thread Gehel (Code Review)

Gehel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352648 )

Change subject: logstash upgrade to elasticsearch 5
..

logstash upgrade to elasticsearch 5

Bug: T161908
Change-Id: Ia2fa08f9c54d09853fd688d85e6afea9905216c5
---
M hieradata/role/common/logstash/collector.yaml
M hieradata/role/common/logstash/elasticsearch.yaml
2 files changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/48/352648/1

diff --git a/hieradata/role/common/logstash/collector.yaml 
b/hieradata/role/common/logstash/collector.yaml
index 52945eb..4bbcc51 100644
--- a/hieradata/role/common/logstash/collector.yaml
+++ b/hieradata/role/common/logstash/collector.yaml
@@ -6,7 +6,6 @@
 # ES-specific
 # NOTE: cluster_name must be kept in sync with the backend
 # node config in hieradata/role/common/logstash/elasticsearch.yaml
-elasticsearch::version: 2
 elasticsearch::auto_create_index: true
 elasticsearch::cluster_name: production-logstash-eqiad
 elasticsearch::expected_nodes: 3
diff --git a/hieradata/role/common/logstash/elasticsearch.yaml 
b/hieradata/role/common/logstash/elasticsearch.yaml
index 31b78fa..7542f99 100644
--- a/hieradata/role/common/logstash/elasticsearch.yaml
+++ b/hieradata/role/common/logstash/elasticsearch.yaml
@@ -7,7 +7,6 @@
 # ES-specific
 # NOTE: cluster_name must be kept in sync with the backend
 # node config in hieradata/role/common/logstash.yaml
-elasticsearch::version: 2
 elasticsearch::auto_create_index: true
 elasticsearch::cluster_name: production-logstash-eqiad
 elasticsearch::expected_nodes: 3

-- 
To view, visit https://gerrit.wikimedia.org/r/352648
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2fa08f9c54d09853fd688d85e6afea9905216c5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: T163549: Only lint pages that have wikitext contentmodel

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352634 )

Change subject: T163549: Only lint pages that have wikitext contentmodel
..


T163549: Only lint pages that have wikitext contentmodel

Change-Id: I540429cd110e69c4cbf451b918c1f64931caa213
---
M lib/logger/LintLogger.js
M lib/wt2html/pp/handlers/linter.js
2 files changed, 12 insertions(+), 0 deletions(-)

Approvals:
  Subramanya Sastry: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/logger/LintLogger.js b/lib/logger/LintLogger.js
index dc59775..158653d 100644
--- a/lib/logger/LintLogger.js
+++ b/lib/logger/LintLogger.js
@@ -33,6 +33,12 @@
return;
}
 
+   // Skip linting if we know we aren't working with wikitext
+   if (env.page.meta.revision.contentmodel &&
+   env.page.meta.revision.contentmodel !== 'wikitext') {
+   return;
+   }
+
if (!env.conf.parsoid.linterSendAPI) {
enabledBuffer.forEach(function(item) {
// Call this async, since recursive sync calls 
to the logger
diff --git a/lib/wt2html/pp/handlers/linter.js 
b/lib/wt2html/pp/handlers/linter.js
index 2827727..8536ede 100644
--- a/lib/wt2html/pp/handlers/linter.js
+++ b/lib/wt2html/pp/handlers/linter.js
@@ -431,6 +431,12 @@
return true;
}
 
+   // Skip linting if we know we aren't working with wikitext
+   if (env.page.meta.revision.contentmodel &&
+   env.page.meta.revision.contentmodel !== 'wikitext') {
+   return true;
+   }
+
var dp = DU.getDataParsoid(node);
 
if (tplInfo && tplInfo.first === node) {

-- 
To view, visit https://gerrit.wikimedia.org/r/352634
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I540429cd110e69c4cbf451b918c1f64931caa213
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 
Gerrit-Reviewer: Arlolra 
Gerrit-Reviewer: C. Scott Ananian 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Overhaul site_stats table

2017-05-08 Thread EddieGP (Code Review)

Hello Krinkle,

I'd like you to do a code review.  Please visit

https://gerrit.wikimedia.org/r/352646

to review the following change.


Change subject: Overhaul site_stats table
..

Overhaul site_stats table

The site stats table holds a bunch of metric fields, two of which are of
data type "bigint unsigned", 3 are "bigint" (signed) and one is int
(signed).  Also the default values differ widely: It is 0 on the
"unsigned" fields, 0 on the unsigned fields and the "int" field, but -1
on the three others. This patch makes all of this more consistent:

Set all fields (except the ss_row_id, which isn't changed) data type to
"bigint unsigned". Also set NULL as the default value for all those
fields. Obviously -1 isn't a possible default value any more. Also, 0
can easily be mistaken for a real value (e.g. ss_active_users=0 -->
"there is nobody active on this wiki"). NULL, by it's definition, is the
value of choice for a value to insert into fields of which we don't know
a correct value.

Bug: T56888
Change-Id: I7d42aae434852a56b6f8dd559d8a5f3bce416021
---
A maintenance/archives/patch-site_stats-modify.sql
A maintenance/mssql/archives/patch-site_stats-modify.sql
M maintenance/mssql/tables.sql
A maintenance/oracle/archives/patch-site_stats-modify.sql
M maintenance/oracle/tables.sql
A maintenance/postgres/archives/patch-site_stats-modify.sql
M maintenance/postgres/tables.sql
A maintenance/sqlite/archives/patch-site_stats-modify.sql
M maintenance/tables.sql
9 files changed, 134 insertions(+), 25 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/46/352646/1

diff --git a/maintenance/archives/patch-site_stats-modify.sql 
b/maintenance/archives/patch-site_stats-modify.sql
new file mode 100644
index 000..690a04f
--- /dev/null
+++ b/maintenance/archives/patch-site_stats-modify.sql
@@ -0,0 +1,7 @@
+ALTER TABLE /*_*/site_stats
+   ALTER ss_total_edits SET DEFAULT NULL,
+   ALTER ss_good_articles SET DEFAULT NULL,
+   MODIFY COLUMN ss_total_pagesbigint unsigned DEFAULT NULL,
+   MODIFY COLUMN ss_users  bigint unsigned DEFAULT NULL,
+   MODIFY COLUMN ss_active_users   bigint unsigned DEFAULT NULL,
+   MODIFY COLUMN ss_images bigint unsigned DEFAULT NULL;
diff --git a/maintenance/mssql/archives/patch-site_stats-modify.sql 
b/maintenance/mssql/archives/patch-site_stats-modify.sql
new file mode 100644
index 000..b2de948
--- /dev/null
+++ b/maintenance/mssql/archives/patch-site_stats-modify.sql
@@ -0,0 +1,32 @@
+/* Delete old default constraints */
+DECLARE @sql nvarchar(max)
+SET @sql=''
+
+/* IMHO: A DBMS where you have to do THIS to change a default value sucks. */
+SELECT @sql= @sql + 'ALTER TABLE site_stats DROP CONSTRAINT ' + df.name + '; '
+FROM sys.default_constraints df
+JOIN sys.columns c
+   ON c.object_id = df.parent_object_id
+   AND c.column_id = df.parent_column_id
+WHERE
+   df.parent_object_id =  OBJECT_ID('site_stats');--
+
+EXEC sp_executesql @sql;
+
+/* Change data type of ss_images from int to bigint.
+ * All other fields (except ss_row_id) already are bigint.
+ * This MUST happen before adding new constraints. */
+ALTER TABLE site_stats ALTER COLUMN ss_images bigint;
+
+/* Add new default constraints.
+ * Don't ask me why I have to repeat ALTER TABLE site_stats
+ * instead of using commas, for some reason SQL Server 2016
+ * didn't accept it in any other way. Maybe I just don't know
+ * enough about mssql, but this works.
+ */
+ALTER TABLE site_stats ADD CONSTRAINT col_ss_total_edits DEFAULT NULL FOR 
ss_total_edits;
+ALTER TABLE site_stats ADD CONSTRAINT col_ss_good_article DEFAULT NULL FOR 
ss_good_articles;
+ALTER TABLE site_stats ADD CONSTRAINT col_ss_total_pages DEFAULT NULL FOR 
ss_total_pages;
+ALTER TABLE site_stats ADD CONSTRAINT col_ss_users DEFAULT NULL FOR ss_users;
+ALTER TABLE site_stats ADD CONSTRAINT col_ss_active_users DEFAULT NULL FOR 
ss_active_users;
+ALTER TABLE site_stats ADD CONSTRAINT col_ss_images DEFAULT NULL FOR ss_images;
diff --git a/maintenance/mssql/tables.sql b/maintenance/mssql/tables.sql
index 3babb39..697ac42 100644
--- a/maintenance/mssql/tables.sql
+++ b/maintenance/mssql/tables.sql
@@ -453,26 +453,26 @@
   ss_row_id int NOT NULL,
 
   -- Total number of edits performed.
-  ss_total_edits bigint default 0,
+  ss_total_edits bigint default NULL,
 
   -- An approximate count of pages matching the following criteria:
   -- * in namespace 0
   -- * not a redirect
   -- * contains the text '[['
   -- See Article::isCountable() in includes/Article.php
-  ss_good_articles bigint default 0,
+  ss_good_articles bigint default NULL,
 
   -- Total pages, theoretically equal to SELECT COUNT(*) FROM page; except 
faster
-  ss_total_pages bigint default '-1',
+  ss_total_pages bigint default NULL,
 
   -- Number of users, theoretically equal to SELECT COUNT(*) FROM user;
-  ss_users bigint default '-1',
+

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Generate visual diff only after switching to visual diff tab

2017-05-08 Thread Esanders (Code Review)

Esanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352642 )

Change subject: Generate visual diff only after switching to visual diff tab
..

Generate visual diff only after switching to visual diff tab

Bug: T164724
Change-Id: I48e49d4b68cc769b3e9d061983de4c78b5ad5c34
---
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
M modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
2 files changed, 15 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/42/352642/1

diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index cee39c0..0934b92 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -,7 +,7 @@
this.bindSaveDialogClearDiff();
this.saveDialog.setDiffAndReview(
$.Deferred().resolve( $( '' ).text( wikitext ) ).promise(),
-   this.getVisualDiffPromise(),
+   this.getVisualDiffGeneratorPromise(),
this.getSurface().getModel().getDocument().getHtmlDocument()
);
 };
@@ -1119,9 +1119,9 @@
 /**
  * Get a visual diff object for the current document state
  *
- * @return {jQuery.Promise|null} Promise resolving with a ve.dm.VisualDiff 
visual diff, or null if not known
+ * @return {jQuery.Promise|null} Promise resolving with a generator for a 
ve.dm.VisualDiff visual diff, or null if not known
  */
-ve.init.mw.ArticleTarget.prototype.getVisualDiffPromise = function () {
+ve.init.mw.ArticleTarget.prototype.getVisualDiffGeneratorPromise = function () 
{
var deferred, dmDoc,
target = this;
 
@@ -1144,13 +1144,17 @@
if ( data && typeof data.content === 'string' ) 
{
doc = target.parseDocument( 
data.content, 'visual' );
target.originalDmDoc = 
target.createModelFromDom( doc, 'visual' );
-   deferred.resolve( new ve.dm.VisualDiff( 
target.originalDmDoc, dmDoc ) );
+   deferred.resolve( function () {
+   return new ve.dm.VisualDiff( 
target.originalDmDoc, dmDoc );
+   } );
}
} );
}
}
if ( this.originalDmDoc ) {
-   deferred.resolve( new ve.dm.VisualDiff( this.originalDmDoc, 
dmDoc ) );
+   deferred.resolve( function () {
+   return new ve.dm.VisualDiff( target.originalDmDoc, 
dmDoc );
+   } );
}
return deferred.promise();
 };
@@ -1705,7 +1709,7 @@
} );
this.saveDialog.setDiffAndReview(
this.getWikitextDiffPromise( doc ),
-   this.getVisualDiffPromise(),
+   this.getVisualDiffGeneratorPromise(),
this.getSurface().getModel().getDocument().getHtmlDocument()
);
 };
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
index 16bf734..e3314f5 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
@@ -122,21 +122,21 @@
  * Set review content and show review panel.
  *
  * @param {string} wikitextDiff Diff HTML or wikitext
- * @param {jQuery.Promise} [visualDiffPromise] Visual diff promise
+ * @param {jQuery.Promise} [visualDiffGeneratorPromise] Visual diff promise
  * @param {HTMLDocument} [baseDoc] Base document against which to normalise 
links when rendering visualDiff
  */
-ve.ui.MWSaveDialog.prototype.setDiffAndReview = function ( 
wikitextDiffPromise, visualDiffPromise, baseDoc ) {
+ve.ui.MWSaveDialog.prototype.setDiffAndReview = function ( 
wikitextDiffPromise, visualDiffGeneratorPromise, baseDoc ) {
var dialog = this;
 
this.clearDiff();
 
// Visual diff
this.$reviewVisualDiff.append( new OO.ui.ProgressBarWidget().$element );
-   if ( visualDiffPromise ) {
+   if ( visualDiffGeneratorPromise ) {
// Don't generate the DiffElement until the tab is switched to
this.getDiffElementPromise = function () {
-   return visualDiffPromise.then( function ( visualDiff ) {
-   var diffElement = new ve.ui.DiffElement( 
visualDiff );
+   return visualDiffGeneratorPromise.then( function ( 
visualDiff ) {
+   var diffElement = new ve.ui.DiffElement( 
visualDiff() );
diffElement.$document.addClass( 
'mw-body-content' );
// Run styles so links render with their 
appropriate classes

[MediaWiki-commits] [Gerrit] operations/puppet[production]: services: use logrotate::conf for logrotate

2017-05-08 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352641 )

Change subject: services: use logrotate::conf for logrotate
..

services: use logrotate::conf for logrotate

Change-Id: Id0556d83d6032e29e149fe4ef95277e522cd2e0e
---
M modules/service/manifests/node.pp
M modules/service/manifests/uwsgi.pp
2 files changed, 4 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/41/352641/1

diff --git a/modules/service/manifests/node.pp 
b/modules/service/manifests/node.pp
index 5a9c819..1b866c9 100644
--- a/modules/service/manifests/node.pp
+++ b/modules/service/manifests/node.pp
@@ -318,11 +318,9 @@
 mode   => '0755',
 }
 
-file { "/etc/logrotate.d/${title}":
+logrotate::conf { $title:
+ensure  => present,
 content => template('service/logrotate.erb'),
-owner   => 'root',
-group   => 'root',
-mode=> '0444',
 }
 }
 
diff --git a/modules/service/manifests/uwsgi.pp 
b/modules/service/manifests/uwsgi.pp
index 79f74a3..3e42432 100644
--- a/modules/service/manifests/uwsgi.pp
+++ b/modules/service/manifests/uwsgi.pp
@@ -124,11 +124,9 @@
 mode   => '0755',
 before => Uwsgi::App[$title],
 }
-file { "/etc/logrotate.d/${title}":
+logrotate:;conf { $title:
+ensure  => present,
 content => template('service/logrotate.erb'),
-owner   => 'root',
-group   => 'root',
-mode=> '0444',
 }
 $local_log_config = {
 logger => [

-- 
To view, visit https://gerrit.wikimedia.org/r/352641
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0556d83d6032e29e149fe4ef95277e522cd2e0e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: ELK - logstash package does not follow the same version naming

2017-05-08 Thread Gehel (Code Review)

Gehel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352608 )

Change subject: ELK - logstash package does not follow the same version naming
..


ELK - logstash package does not follow the same version naming

Bug: T161908
Change-Id: Ief5b9570a42cc300dac5c7d3bfcd03bf2f54f999
---
M modules/aptrepo/files/updates
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  Gehel: Looks good to me, approved



diff --git a/modules/aptrepo/files/updates b/modules/aptrepo/files/updates
index 95e4c16..a6cdf94 100644
--- a/modules/aptrepo/files/updates
+++ b/modules/aptrepo/files/updates
@@ -73,7 +73,7 @@
 GetInRelease: no
 Architectures: amd64
 VerifyRelease: D27D666CD88E42B4
-ListShellHook: grep-dctrl -X -S '^elasticsearch|logstash|kibana$' -a -F 
Version --eq 5.3.2 || [ $? -eq 1 ]
+ListShellHook: grep-dctrl -e \( -S '^elasticsearch|kibana$' -a -F Version --eq 
5.3.2 \) -o \( -S '^logstash$' -a -F Version --eq 1:5.3.2-1 \) || [ $? -eq 1 ]
 
 Name: elasticsearch-curator
 Method: http://packages.elastic.co/curator/5/debian

-- 
To view, visit https://gerrit.wikimedia.org/r/352608
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ief5b9570a42cc300dac5c7d3bfcd03bf2f54f999
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: graphite: use logrotate::conf for logrotate

2017-05-08 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352639 )

Change subject: graphite: use logrotate::conf for logrotate
..

graphite: use logrotate::conf for logrotate

Change-Id: Ic18762b977618269ea083604b7ff6abc5ac76d3c
---
M modules/graphite/manifests/web.pp
1 file changed, 1 insertion(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/39/352639/1

diff --git a/modules/graphite/manifests/web.pp 
b/modules/graphite/manifests/web.pp
index 9f15e2a..c5f73ee 100644
--- a/modules/graphite/manifests/web.pp
+++ b/modules/graphite/manifests/web.pp
@@ -145,13 +145,9 @@
 require => File['/usr/local/sbin/graphite-auth'],
 }
 
-file { '/etc/logrotate.d/graphite-web':
+logrotate::conf { 'graphite-web':
 ensure  => present,
-mode=> '0444',
-owner   => 'root',
-group   => 'root',
 source  => 'puppet:///modules/graphite/graphite-web-logrotate',
-require => File['/var/log/graphite-web'],
 }
 
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/352639
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic18762b977618269ea083604b7ff6abc5ac76d3c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mediawiki::jobrunner: use logrotate::conf for logrotate

2017-05-08 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352638 )

Change subject: mediawiki::jobrunner: use logrotate::conf for logrotate
..

mediawiki::jobrunner: use logrotate::conf for logrotate

Change-Id: I69d5a3f22a6100145abadbd7e9e5f26cb7624546
---
M modules/mediawiki/manifests/jobrunner.pp
1 file changed, 4 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/38/352638/1

diff --git a/modules/mediawiki/manifests/jobrunner.pp 
b/modules/mediawiki/manifests/jobrunner.pp
index 846260a..46be7a5 100644
--- a/modules/mediawiki/manifests/jobrunner.pp
+++ b/modules/mediawiki/manifests/jobrunner.pp
@@ -80,18 +80,14 @@
 }
 }
 
-file { '/etc/logrotate.d/mediawiki_jobchron':
+logrotate::conf { 'mediawiki_jobchron':
+ensure  => present,
 content => template('mediawiki/jobrunner/logrotate-jobchron.conf.erb'),
-owner   => 'root',
-group   => 'root',
-mode=> '0444',
 }
 
-file { '/etc/logrotate.d/mediawiki_jobrunner':
+logrotate::conf { 'mediawiki_jobrunner':
+ensure  => present,
 content => template('mediawiki/jobrunner/logrotate.conf.erb'),
-owner   => 'root',
-group   => 'root',
-mode=> '0444',
 }
 
 include ::apache::mod::proxy_fcgi

-- 
To view, visit https://gerrit.wikimedia.org/r/352638
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I69d5a3f22a6100145abadbd7e9e5f26cb7624546
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: etcd: use logrotate::conf for logrotate

2017-05-08 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352637 )

Change subject: etcd: use logrotate::conf for logrotate
..

etcd: use logrotate::conf for logrotate

Change-Id: Ic2a85a3bbda48a5767bf1aaa2793f458352489ba
---
M modules/etcd/manifests/logging.pp
1 file changed, 2 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/37/352637/1

diff --git a/modules/etcd/manifests/logging.pp 
b/modules/etcd/manifests/logging.pp
index afe7c0a..9827d43 100644
--- a/modules/etcd/manifests/logging.pp
+++ b/modules/etcd/manifests/logging.pp
@@ -3,13 +3,10 @@
 # Manages all the logging logic for etcd.
 class etcd::logging {
 
-file { '/etc/logrotate.d/etcd':
+logrotate::conf { '/etcd':
+ensure => present,
 source => 'puppet:///modules/etcd/logrotate.conf',
-owner  => 'root',
-group  => 'root',
-mode   => '0444',
 }
-
 
 rsyslog::conf { 'etcd':
 source   => 'puppet:///modules/etcd/rsyslog.conf',

-- 
To view, visit https://gerrit.wikimedia.org/r/352637
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2a85a3bbda48a5767bf1aaa2793f458352489ba
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: use logrotate::conf for logrotate

2017-05-08 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352636 )

Change subject: openstack: use logrotate::conf for logrotate
..

openstack: use logrotate::conf for logrotate

Change-Id: I71776e0ccf7e2549d01292f4609e811ec2862dd5
---
M modules/openstack/manifests/designate/service.pp
M modules/openstack/manifests/keystone/service.pp
2 files changed, 12 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/352636/1

diff --git a/modules/openstack/manifests/designate/service.pp 
b/modules/openstack/manifests/designate/service.pp
index ff000b9..a27f117 100644
--- a/modules/openstack/manifests/designate/service.pp
+++ b/modules/openstack/manifests/designate/service.pp
@@ -93,19 +93,13 @@
 
 # These would be automatically included in a correct designate package...
 # probably this can be ripped out in Liberty.
-file { '/etc/logrotate.d/designate-mdns':
+logrotate::conf { 'designate-mdns':
 ensure => present,
 source => 'puppet:///modules/openstack/designate-mdns.logrotate',
-owner  => 'root',
-group  => 'root',
-mode   => '0444',
 }
-file { '/etc/logrotate.d/designate-pool-manager':
+logrotate::conf { 'designate-pool-manager':
 ensure => present,
 source => 
'puppet:///modules/openstack/designate-pool-manager.logrotate',
-owner  => 'root',
-group  => 'root',
-mode   => '0444',
 }
 
 file { '/var/lib/designate/.ssh/':
diff --git a/modules/openstack/manifests/keystone/service.pp 
b/modules/openstack/manifests/keystone/service.pp
index 699eb14..c53e368 100644
--- a/modules/openstack/manifests/keystone/service.pp
+++ b/modules/openstack/manifests/keystone/service.pp
@@ -78,18 +78,16 @@
 mode=> '0644',
 notify  => Service['uwsgi-keystone-admin', 
'uwsgi-keystone-public'],
 recurse => true;
-'/etc/logrotate.d/keystone-public-uwsgi':
-ensure => present,
-source => 
'puppet:///modules/openstack/keystone-public-uwsgi.logrotate',
-owner  => 'root',
-group  => 'root',
-mode   => '0444';
-'/etc/logrotate.d/keystone-admin-uwsgi':
-ensure => present,
-source => 
'puppet:///modules/openstack/keystone-admin-uwsgi.logrotate',
-owner  => 'root',
-group  => 'root',
-mode   => '0444';
+}
+
+logrotate::conf { 'keystone-public-uwsgi':
+ensure => present,
+source => 
'puppet:///modules/openstack/keystone-public-uwsgi.logrotate',
+}
+
+logrotate::conf { 'keystone-admin-uwsgi':
+ensure => present,
+source => 'puppet:///modules/openstack/keystone-admin-uwsgi.logrotate',
 }
 
 if $::fqdn == hiera('labs_nova_controller') {

-- 
To view, visit https://gerrit.wikimedia.org/r/352636
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I71776e0ccf7e2549d01292f4609e811ec2862dd5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] oojs/ui[master]: TagMultiselectWidget: Fix #addTag return value to match docs

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352625 )

Change subject: TagMultiselectWidget: Fix #addTag return value to match docs
..


TagMultiselectWidget: Fix #addTag return value to match docs

Change-Id: I48212e6049e7e9c636bdc0ee63d2cf92f063e999
---
M src/widgets/TagMultiselectWidget.js
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Jforrester: Looks good to me, approved



diff --git a/src/widgets/TagMultiselectWidget.js 
b/src/widgets/TagMultiselectWidget.js
index 5fc9815..f69361e 100644
--- a/src/widgets/TagMultiselectWidget.js
+++ b/src/widgets/TagMultiselectWidget.js
@@ -604,7 +604,9 @@
newItemWidget = this.createTagItemWidget( data, label );
newItemWidget.toggleValid( isValid );
this.addItems( [ newItemWidget ] );
+   return true;
}
+   return false;
 };
 
 /**

-- 
To view, visit https://gerrit.wikimedia.org/r/352625
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I48212e6049e7e9c636bdc0ee63d2cf92f063e999
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable Flow beta feature on cawikiquote

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/351891 )

Change subject: Enable Flow beta feature on cawikiquote
..


Enable Flow beta feature on cawikiquote

Bug: T164498
Change-Id: I8986955abd49d5c3c4f74abc0b6d08fa4de39c61
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 1c4e756..301acc1 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -16687,6 +16687,7 @@
'arwiki' => true, // T155720
'bswiki' => true,
'cawiki' => true, // T120829
+   'cawikiquote' => true, // T164498
'elwiki' => true, // T144384
'frwiki' => true, // T136684
'frwikiquote' => true, // T138064

-- 
To view, visit https://gerrit.wikimedia.org/r/351891
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8986955abd49d5c3c4f74abc0b6d08fa4de39c61
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: elasticsearch: use logrotate::conf for logrotate

2017-05-08 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352635 )

Change subject: elasticsearch: use logrotate::conf for logrotate
..

elasticsearch: use logrotate::conf for logrotate

Change-Id: I30ee0bb74e2c96f333b70f4b08964e284518691c
---
M modules/elasticsearch/manifests/init.pp
1 file changed, 4 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/35/352635/1

diff --git a/modules/elasticsearch/manifests/init.pp 
b/modules/elasticsearch/manifests/init.pp
index 7c050b6..ab36d98 100644
--- a/modules/elasticsearch/manifests/init.pp
+++ b/modules/elasticsearch/manifests/init.pp
@@ -222,13 +222,12 @@
 mode=> '0444',
 require => Package['elasticsearch'],
 }
-file { '/etc/logrotate.d/elasticsearch':
-ensure => file,
-owner  => 'root',
-group  => 'root',
-mode   => '0444',
+
+logrotate::conf { 'elasticsearch':
+ensure => present,
 source => 'puppet:///modules/elasticsearch/logrotate',
 }
+
 file { $data_dir:
   ensure  => directory,
   owner   => 'elasticsearch',

-- 
To view, visit https://gerrit.wikimedia.org/r/352635
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I30ee0bb74e2c96f333b70f4b08964e284518691c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: T163549: Only lint pages that have wikitext contentmodel

2017-05-08 Thread Arlolra (Code Review)

Arlolra has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352634 )

Change subject: T163549: Only lint pages that have wikitext contentmodel
..

T163549: Only lint pages that have wikitext contentmodel

Change-Id: I540429cd110e69c4cbf451b918c1f64931caa213
---
M lib/logger/LintLogger.js
M lib/wt2html/pp/handlers/linter.js
2 files changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/34/352634/1

diff --git a/lib/logger/LintLogger.js b/lib/logger/LintLogger.js
index dc59775..158653d 100644
--- a/lib/logger/LintLogger.js
+++ b/lib/logger/LintLogger.js
@@ -33,6 +33,12 @@
return;
}
 
+   // Skip linting if we know we aren't working with wikitext
+   if (env.page.meta.revision.contentmodel &&
+   env.page.meta.revision.contentmodel !== 'wikitext') {
+   return;
+   }
+
if (!env.conf.parsoid.linterSendAPI) {
enabledBuffer.forEach(function(item) {
// Call this async, since recursive sync calls 
to the logger
diff --git a/lib/wt2html/pp/handlers/linter.js 
b/lib/wt2html/pp/handlers/linter.js
index 2827727..8536ede 100644
--- a/lib/wt2html/pp/handlers/linter.js
+++ b/lib/wt2html/pp/handlers/linter.js
@@ -431,6 +431,12 @@
return true;
}
 
+   // Skip linting if we know we aren't working with wikitext
+   if (env.page.meta.revision.contentmodel &&
+   env.page.meta.revision.contentmodel !== 'wikitext') {
+   return true;
+   }
+
var dp = DU.getDataParsoid(node);
 
if (tplInfo && tplInfo.first === node) {

-- 
To view, visit https://gerrit.wikimedia.org/r/352634
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I540429cd110e69c4cbf451b918c1f64931caa213
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: ocg: use logrotate::conf for logrotate

2017-05-08 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352633 )

Change subject: ocg: use logrotate::conf for logrotate
..

ocg: use logrotate::conf for logrotate

Change-Id: Ia8c450cd7f5e058f47cb56117dc4d66a39e09c53
---
M modules/ocg/manifests/init.pp
1 file changed, 1 insertion(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/33/352633/1

diff --git a/modules/ocg/manifests/init.pp b/modules/ocg/manifests/init.pp
index a56eee0..06bac51 100644
--- a/modules/ocg/manifests/init.pp
+++ b/modules/ocg/manifests/init.pp
@@ -220,12 +220,9 @@
 }
 }
 
-file { '/etc/logrotate.d/ocg':
+logrotate::conf { 'ocg':
 ensure => present,
 source => 'puppet:///modules/ocg/logrotate',
-mode   => '0444',
-owner  => 'root',
-group  => 'root',
 }
 
 # run logrotate hourly, instead of daily, to ensure that log size

-- 
To view, visit https://gerrit.wikimedia.org/r/352633
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8c450cd7f5e058f47cb56117dc4d66a39e09c53
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: ApiQueryRevisions: Restore use of rvstartid/rvendid as a tie...

2017-05-08 Thread Anomie (Code Review)

Anomie has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352632 )

Change subject: ApiQueryRevisions: Restore use of rvstartid/rvendid as a 
tiebreaker
..

ApiQueryRevisions: Restore use of rvstartid/rvendid as a tiebreaker

If rvstartid/rvendid are used with revisions that have the same
timestamp, we should omit any revisions with the same timestamp but
out-of-range IDs.

Bug: T163532
Change-Id: I6ba5e0724945668dad55eec0d09cb7d3fe08e347
---
M includes/api/ApiQueryRevisions.php
1 file changed, 26 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/32/352632/1

diff --git a/includes/api/ApiQueryRevisions.php 
b/includes/api/ApiQueryRevisions.php
index 3e077c3..b0a8468 100644
--- a/includes/api/ApiQueryRevisions.php
+++ b/includes/api/ApiQueryRevisions.php
@@ -259,12 +259,34 @@
$p = $this->encodeParamName( 'endid' );
$this->dieWithError( [ 
'apierror-revisions-badid', $p ], "badid_$p" );
}
+
+   if ( $params['start'] !== null ) {
+   $op = ( $params['dir'] === 'newer' ? 
'>' : '<' );
+   $ts = $db->addQuotes( 
$db->timestampOrNull( $params['start'] ) );
+   if ( $params['startid'] !== null ) {
+   $this->addWhere( "rev_timestamp 
$op $ts OR "
+   . "rev_timestamp = $ts 
AND rev_id $op= " . intval( $params['startid'] ) );
+   } else {
+   $this->addWhere( "rev_timestamp 
$op= $ts" );
+   }
+   }
+   if ( $params['end'] !== null ) {
+   $op = ( $params['dir'] === 'newer' ? 
'<' : '>' ); // Yes, opposite of the above
+   $ts = $db->addQuotes( 
$db->timestampOrNull( $params['end'] ) );
+   if ( $params['endid'] !== null ) {
+   $this->addWhere( "rev_timestamp 
$op $ts OR "
+   . "rev_timestamp = $ts 
AND rev_id $op= " . intval( $params['endid'] ) );
+   } else {
+   $this->addWhere( "rev_timestamp 
$op= $ts" );
+   }
+   }
+   } else {
+   $this->addTimestampWhereRange( 'rev_timestamp', 
$params['dir'],
+   $params['start'], $params['end'] );
}
 
-   $this->addTimestampWhereRange( 'rev_timestamp', 
$params['dir'],
-   $params['start'], $params['end'] );
-   // Dummy to add rev_id to ORDER BY
-   $this->addWhereRange( 'rev_id', $params['dir'], null, 
null );
+   $sort = ( $params['dir'] === 'newer' ? '' : 'DESC' );
+   $this->addOption( 'ORDER BY', [ "rev_timestamp $sort", 
"rev_id $sort" ] );
 
// There is only one ID, use it
$ids = array_keys( $pageSet->getGoodTitles() );

-- 
To view, visit https://gerrit.wikimedia.org/r/352632
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ba5e0724945668dad55eec0d09cb7d3fe08e347
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: librenms: use logrotate::conf for logrotate

2017-05-08 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352631 )

Change subject: librenms: use logrotate::conf for logrotate
..

librenms: use logrotate::conf for logrotate

Change-Id: I3a1a2d1c93eb808e7bf514cff0d96694fde219e5
---
M modules/librenms/manifests/init.pp
1 file changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/31/352631/1

diff --git a/modules/librenms/manifests/init.pp 
b/modules/librenms/manifests/init.pp
index 8c7bf9c..ebae4fc 100644
--- a/modules/librenms/manifests/init.pp
+++ b/modules/librenms/manifests/init.pp
@@ -41,10 +41,8 @@
 require => Group['librenms'],
 }
 
-file { '/etc/logrotate.d/librenms':
+logrotate::conf { 'librenms':
 ensure => present,
-owner  => 'root',
-group  => 'root',
 source => 'puppet:///modules/librenms/logrotate',
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/352631
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a1a2d1c93eb808e7bf514cff0d96694fde219e5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable cookie blocking on all remaining production wikis

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350090 )

Change subject: Enable cookie blocking on all remaining production wikis
..


Enable cookie blocking on all remaining production wikis

Bug: T162651
Change-Id: I531cd471792b5d2e529986d7ff25241b6463da2e
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 3 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 3de707c..1c4e756 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -7533,9 +7533,7 @@
 ],
 
 'wgCookieSetOnAutoblock' => [
-   'default' => false,
-   'testwiki' => true, // T150991
-   'enwiki' => true, // T152076
+   'default' => true,
 ],
 
 # groupOverrides @{

-- 
To view, visit https://gerrit.wikimedia.org/r/350090
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I531cd471792b5d2e529986d7ff25241b6463da2e
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Kaldari 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Fix typo in stretch config

2017-05-08 Thread Faidon Liambotis (Code Review)

Faidon Liambotis has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/351640 )

Change subject: Fix typo in stretch config
..


Fix typo in stretch config

Unless I'm missing something, this seems like a typo?

Change-Id: I10daa101d6ecd2549f1a73cbc277eb221f3d34f3
---
M modules/aptrepo/files/distributions-wikimedia
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Faidon Liambotis: Verified; Looks good to me, approved



diff --git a/modules/aptrepo/files/distributions-wikimedia 
b/modules/aptrepo/files/distributions-wikimedia
index 40d0517..94ee27d 100644
--- a/modules/aptrepo/files/distributions-wikimedia
+++ b/modules/aptrepo/files/distributions-wikimedia
@@ -34,7 +34,7 @@
 Suite: stretch-wikimedia
 Codename: stretch-wikimedia
 AlsoAcceptFor: stretch stretch-backports
-Version: 8
+Version: 9
 Architectures: source amd64 i386
 Components: main backports thirdparty experimental
 UDebComponents: main backports thirdparty experimental

-- 
To view, visit https://gerrit.wikimedia.org/r/351640
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I10daa101d6ecd2549f1a73cbc277eb221f3d34f3
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Make fields config apply to test wikidata too

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352617 )

Change subject: Make fields config apply to test wikidata too
..


Make fields config apply to test wikidata too

Bug: T164614
Change-Id: I6905365b70d09a3863c1df5b1dfe4888c7c4f437
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 00da672..3de707c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17541,7 +17541,7 @@
// actual searches
'merge.scheduler.max_thread_count' => 1,
],
-   '+wikidatawiki' => [
+   '+wikidata' => [
// increase defaults to add language specific fields
'index.mapping.total_fields.limit' => 5000,
],

-- 
To view, visit https://gerrit.wikimedia.org/r/352617
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6905365b70d09a3863c1df5b1dfe4888c7c4f437
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Use consistent label for button across editors

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350546 )

Change subject: Use consistent label for button across editors
..


Use consistent label for button across editors

Change-Id: I1a299522e95cdb4a6e5bdbdda1c65d4fcec22133
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M resources/ext.CodeMirror.js
4 files changed, 5 insertions(+), 20 deletions(-)

Approvals:
  Pastakhov: Looks good to me, approved
  jenkins-bot: Verified
  Jforrester: Looks good to me, approved



diff --git a/extension.json b/extension.json
index c592dab..9575060 100644
--- a/extension.json
+++ b/extension.json
@@ -37,8 +37,7 @@
"ext.CodeMirror.less"
],
"messages": [
-   "codemirror-enable-label",
-   "codemirror-disable-label"
+   "codemirror-toggle-label"
]
},
"ext.CodeMirror.lib": {
diff --git a/i18n/en.json b/i18n/en.json
index 425efaf..4ed7044 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -5,7 +5,5 @@
]
},
"codemirror-desc": "Provides syntax highlighting in wikitext editor",
-   "codemirror-enable-label": "Enable CodeMirror (Syntax highlight)",
-   "codemirror-disable-label": "Disable CodeMirror (Syntax highlight)",
"codemirror-toggle-label": "Syntax highlighting"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 81cc890..d2979df 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -8,7 +8,5 @@
]
},
"codemirror-desc": "{{desc|name=Code 
Mirror|url=https://www.mediawiki.org/wiki/Extension:CodeMirror}}\n\nAdditional 
info: Discription of \"Syntax highlighting\" in 
wiki\n[[mw:Extension:SyntaxHighlight GeSHi]]",
-   "codemirror-enable-label": "Title tooltip for button to enable 
CodeMirror in the editing toolbar.",
-   "codemirror-disable-label": "Title tooltip for button to disable 
CodeMirror in the editing toolbar.",
"codemirror-toggle-label": "Title tooltip for button to toggle 
CodeMirror in the editing toolbar."
 }
diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js
index 8149619..a47378a 100644
--- a/resources/ext.CodeMirror.js
+++ b/resources/ext.CodeMirror.js
@@ -251,7 +251,7 @@
codemirror: {
tools: {
CodeMirror: {
-   label: 
mw.msg( useCodeMirror ? 'codemirror-disable-label' : 'codemirror-enable-label' 
),
+   label: 
mw.msg( 'codemirror-toggle-label' ),
type: 
'button',
offset: 
[ 2, 2 ],
action: 
{
@@ -313,24 +313,14 @@
 * @param {Object} [wikiEditor] WikiEditor, if present
 */
function updateToolbarButton( wikiEditor ) {
-   var label;
-
-   if ( useCodeMirror ) {
-   label = mw.msg( 'codemirror-disable-label' );
-   } else {
-   label = mw.msg( 'codemirror-enable-label' );
-   }
-
if ( wikiEditor ) {
wikiEditor.modules.toolbar.$toolbar.find( 
'a.tool[rel=CodeMirror]' )
.toggleClass( 'tool-codemirror-on', 
!!useCodeMirror )
-   .toggleClass( 'tool-codemirror-off', 
!useCodeMirror )
-   .attr( 'title', label );
+   .toggleClass( 'tool-codemirror-off', 
!useCodeMirror );
} else {
$( '#mw-editbutton-codemirror' )
.toggleClass( 'mw-editbutton-codemirror-on', 
!!useCodeMirror )
-   .toggleClass( 'mw-editbutton-codemirror-off', 
!useCodeMirror )
-   .attr( 'title', label );
+   .toggleClass( 'mw-editbutton-codemirror-off', 
!useCodeMirror );
}
}
 
@@ -408,7 +398,7 @@
mw.loader.using( 'mediawiki.toolbar', function () {
// If WikiEditor isn't enabled, add CodeMirror 
button to the default wiki editor toolbar
mw.toolbar.addButton( {
-   speedTip: 'CodeMirror',
+   speedTip: mw.msg( 
'codemirror-toggle-label' ),
imageId:

[MediaWiki-commits] [Gerrit] mediawiki...Cite[master]: Highlight text inside tags as a wikitext in CodeMirror...

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/348673 )

Change subject: Highlight text inside  tags as a wikitext in CodeMirror 
editor
..


Highlight text inside  tags as a wikitext in CodeMirror editor

see bug T163238
Depends-On: Idb7a1a5769a1047ef2f7cd25a7152f73a6613225
Change-Id: I1bf156fa813af4d5f891619f692047bbdb8a1a86
---
M extension.json
1 file changed, 3 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Kaldari: Looks good to me, approved



diff --git a/extension.json b/extension.json
index ac9cd43..60c39ef 100644
--- a/extension.json
+++ b/extension.json
@@ -110,5 +110,8 @@
"TrackingCategories": [
"cite-tracking-category-cite-error"
],
+   "CodeMirrorTagModes": {
+   "ref": "text/mediawiki"
+   },
"manifest_version": 1
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/348673
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1bf156fa813af4d5f891619f692047bbdb8a1a86
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: Pastakhov 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: Pastakhov 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: VisualEditor source mode support

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/343878 )

Change subject: VisualEditor source mode support
..


VisualEditor source mode support

Long-term todo:
* Performance will be poor on large pages due
  to using a auto-height textarea which CodeMirror
  doesn't optimise.

Change-Id: I16598fcdbeee51e6fae88376ec81f1c8552b383d
---
M .eslintrc.json
M CodeMirror.hooks.php
M Gruntfile.js
M extension.json
M i18n/en.json
M i18n/qqq.json
M resources/ext.CodeMirror.less
A resources/modules/ve-cm/ve.ui.CodeMirror.init.js
A resources/modules/ve-cm/ve.ui.CodeMirror.init.less
A resources/modules/ve-cm/ve.ui.CodeMirrorAction.js
A resources/modules/ve-cm/ve.ui.CodeMirrorTool.js
11 files changed, 312 insertions(+), 6 deletions(-)

Approvals:
  jenkins-bot: Verified
  Jforrester: Looks good to me, approved



diff --git a/.eslintrc.json b/.eslintrc.json
index 40f6bcf..6068805 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -7,7 +7,10 @@
},
"globals": {
"mediaWiki": false,
-   "CodeMirror": false
+   "CodeMirror": false,
+   "ve": false,
+   "mw": false,
+   "OO": false
},
"rules": {
"dot-notation": [ "error", { "allowKeywords": true } ]
diff --git a/CodeMirror.hooks.php b/CodeMirror.hooks.php
index 147148d..6bbaa15 100644
--- a/CodeMirror.hooks.php
+++ b/CodeMirror.hooks.php
@@ -107,8 +107,8 @@
 */
public static function onMakeGlobalVariablesScript( array &$vars, 
OutputPage $out ) {
$context = $out->getContext();
-   // add CodeMirror vars only for edit pages
-   if ( self::isCodeMirrorEnabled( $context ) ) {
+   // add CodeMirror vars on edit pages, or if VE is installed
+   if ( self::isCodeMirrorEnabled( $context ) || class_exists( 
'VisualEditorHooks' )  ) {
$vars['extCodeMirrorConfig'] = self::getConfiguraton( 
$context );
}
}
diff --git a/Gruntfile.js b/Gruntfile.js
index 4a474d8..90f0e22 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -15,7 +15,7 @@
},
stylelint: {
all: [
-   '**/*.css',
+   '**/*.{css,less}',
'!resources/lib/**',
'!node_modules/**'
]
diff --git a/extension.json b/extension.json
index 309e110..c592dab 100644
--- a/extension.json
+++ b/extension.json
@@ -96,6 +96,37 @@
"ext.CodeMirror.lib.mode.clike",
"ext.CodeMirror.lib"
]
+   },
+   "ext.CodeMirror.visualEditor.init": {
+   "scripts": [
+   "modules/ve-cm/ve.ui.CodeMirror.init.js"
+   ],
+   "styles": [
+   "modules/ve-cm/ve.ui.CodeMirror.init.less"
+   ],
+   "messages": [
+   "codemirror-toggle-label"
+   ],
+   "targets": [
+   "desktop"
+   ]
+   },
+   "ext.CodeMirror.visualEditor": {
+   "dependencies": [
+   "ext.visualEditor.mwcore",
+   "ext.CodeMirror.lib",
+   "ext.CodeMirror.mode.mediawiki",
+   "mediawiki.api",
+   "mediawiki.api.options",
+   "user.options"
+   ],
+   "scripts": [
+   "modules/ve-cm/ve.ui.CodeMirrorAction.js",
+   "modules/ve-cm/ve.ui.CodeMirrorTool.js"
+   ],
+   "targets": [
+   "desktop"
+   ]
}
},
"ResourceFileModulePaths": {
@@ -113,6 +144,10 @@
"CodeMirrorHooks::onGetPreferences"
]
},
+   "VisualEditorPluginModules": [
+   "ext.CodeMirror.visualEditor.init",
+   "ext.CodeMirror.visualEditor"
+   ],
"config": {
"CodeMirrorEnableFrontend": true
},
diff --git a/i18n/en.json b/i18n/en.json
index a77c902..425efaf 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -6,5 +6,6 @@
},
"codemirror-desc": "Provides syntax highlighting in wikitext editor",
"codemirror-enable-label": "Enable CodeMirror (Syntax highlight)",
-   "codemirror-disable-label": "Disable CodeMirror (Syntax highlight)"
+   "codemirror-disable-label":

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Fix colors to match style guide

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/350697 )

Change subject: Fix colors to match style guide
..


Fix colors to match style guide

Bug: T163048
Change-Id: I6b88be34dc1ba129a002cca32950f746518ff924
---
M static/images/project-logos/wikidata.png
M static/images/project-logos/wikidatawiki.png
2 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/static/images/project-logos/wikidata.png 
b/static/images/project-logos/wikidata.png
index 2520640..1131f68 100644
--- a/static/images/project-logos/wikidata.png
+++ b/static/images/project-logos/wikidata.png
Binary files differ
diff --git a/static/images/project-logos/wikidatawiki.png 
b/static/images/project-logos/wikidatawiki.png
index 2520640..1131f68 100644
--- a/static/images/project-logos/wikidatawiki.png
+++ b/static/images/project-logos/wikidatawiki.png
Binary files differ

-- 
To view, visit https://gerrit.wikimedia.org/r/350697
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b88be34dc1ba129a002cca32950f746518ff924
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Abián 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[wmf/1.29.0-wmf.21]: Follow-up 57a06a6: Use the same attribute name on read and o...

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/351527 )

Change subject: Follow-up 57a06a6: Use the same attribute name on read and on 
write
..


Follow-up 57a06a6: Use the same attribute name on read and on write

Bug: T164054
Change-Id: I6770f6c91248fcd9ab39322413874e20a1b65552
(cherry picked from commit 486bbd76090919306f5cadbae0bd85eefc8500f1)
---
M modules/ve-mw/dm/metaitems/ve.dm.MWFlaggedMetaItem.js
1 file changed, 8 insertions(+), 8 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve-mw/dm/metaitems/ve.dm.MWFlaggedMetaItem.js 
b/modules/ve-mw/dm/metaitems/ve.dm.MWFlaggedMetaItem.js
index d04011e..794b3e0 100644
--- a/modules/ve-mw/dm/metaitems/ve.dm.MWFlaggedMetaItem.js
+++ b/modules/ve-mw/dm/metaitems/ve.dm.MWFlaggedMetaItem.js
@@ -30,26 +30,26 @@
 ve.dm.MWFlaggedMetaItem.static.matchTagNames = [ 'meta' ];
 
 ve.dm.MWFlaggedMetaItem.static.toDataElement = function ( domElements ) {
-   var type = domElements[ 0 ].getAttribute( 'property' );
+   var property = domElements[ 0 ].getAttribute( 'property' );
 
-   if ( !type || this.matchRdfaTypes.indexOf( type ) === -1 ) {
+   if ( !property || this.matchRdfaTypes.indexOf( property ) === -1 ) {
// Fallback to first match if somehow unset
-   type = this.matchRdfaTypes[ 0 ];
+   property = this.matchRdfaTypes[ 0 ];
}
 
-   return { type: this.name, attributes: { type: type } };
+   return { type: this.name, attributes: { property: property } };
 };
 
 ve.dm.MWFlaggedMetaItem.static.toDomElements = function ( dataElement, doc ) {
var meta = doc.createElement( 'meta' ),
-   type = OO.getProp( dataElement, 'attributes', 'property' );
+   property = OO.getProp( dataElement, 'attributes', 'property' );
 
-   if ( !type || this.matchRdfaTypes.indexOf( type ) === -1 ) {
+   if ( !property || this.matchRdfaTypes.indexOf( property ) === -1 ) {
// Fallback to first item if somehow unset
-   type = this.matchRdfaTypes[ 0 ];
+   property = this.matchRdfaTypes[ 0 ];
}
 
-   meta.setAttribute( 'property', type );
+   meta.setAttribute( 'property', property );
 
return [ meta ];
 };

-- 
To view, visit https://gerrit.wikimedia.org/r/351527
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6770f6c91248fcd9ab39322413874e20a1b65552
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.29.0-wmf.21
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.29.0-wmf.21]: Toggle logo preloading via the skin

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/352546 )

Change subject: Toggle logo preloading via the skin
..


Toggle logo preloading via the skin

Bug: T100999
Change-Id: I0e18dc7fdbf133f3e4002f48f3040604687571dc
---
M includes/OutputPage.php
M includes/skins/Skin.php
2 files changed, 17 insertions(+), 1 deletion(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 5c05ad7..85610b9 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2388,7 +2388,14 @@
// jQuery etc. can work correctly.
$response->header( 'X-UA-Compatible: IE=Edge' );
 
-   $this->addLogoPreloadLinkHeaders();
+   if ( !$this->mArticleBodyOnly ) {
+   $sk = $this->getSkin();
+
+   if ( $sk->shouldPreloadLogo() ) {
+   $this->addLogoPreloadLinkHeaders();
+   }
+   }
+
$linkHeader = $this->getLinkHeader();
if ( $linkHeader ) {
$response->header( $linkHeader );
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 99658f29..7f00767 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -445,6 +445,15 @@
}
 
/**
+* Whether the logo should be preloaded with an HTTP link header or not
+* @since 1.29
+* @return bool
+*/
+   public function shouldPreloadLogo() {
+   return false;
+   }
+
+   /**
 * @return string HTML
 */
function getCategoryLinks() {

-- 
To view, visit https://gerrit.wikimedia.org/r/352546
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0e18dc7fdbf133f3e4002f48f3040604687571dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.21
Gerrit-Owner: Gilles 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[wmf/1.29.0-wmf.21]: Export publish-short message for mobile

2017-05-08 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/351893 )

Change subject: Export publish-short message for mobile
..


Export publish-short message for mobile

Bug: T164472
Change-Id: I143bc119583d73590a776bc0b1a43f90e19f513c
---
M extension.json
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index 0b600bd..f9b4ed6 100644
--- a/extension.json
+++ b/extension.json
@@ -1283,6 +1283,7 @@
"visualeditor-savedialog-error-badtoken",
"visualeditor-savedialog-label-create",
"visualeditor-savedialog-label-error",
+   "visualeditor-savedialog-label-publish-short",
"visualeditor-savedialog-label-report",

"visualeditor-savedialog-label-resolve-conflict",
"visualeditor-savedialog-label-resume-editing",

-- 
To view, visit https://gerrit.wikimedia.org/r/351893
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I143bc119583d73590a776bc0b1a43f90e19f513c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.29.0-wmf.21
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Esanders 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] oojs/ui[master]: MenuTagMultiselectWidget: Handle the 'selected' config option

2017-05-08 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352630 )

Change subject: MenuTagMultiselectWidget: Handle the 'selected' config option
..

MenuTagMultiselectWidget: Handle the 'selected' config option

TagMultiselectWidget's 'selected' config option handling didn't work,
because this.menu is not yet set up while the parent constructor runs,
causing exceptions when #getAllowedValues tried to access it to
validate values.

Now #getAllowedValues rejects everything when this.menu is not set up
yet. To handle the 'selected' config option being passed, simply try
to set the value again after our setup completes.

Also add examples to demos.

Bug: T164750
Change-Id: I0a62a947f1229bc957de9a79c451f309c4269d3c
---
M demos/pages/widgets.js
M src/widgets/MenuTagMultiselectWidget.js
2 files changed, 36 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/30/352630/1

diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index 15d3839..72cf616 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -1446,6 +1446,33 @@
),
new OO.ui.FieldLayout(
new OO.ui.MenuTagMultiselectWidget( {
+   selected: [
+   { data: 'foo', label: 
'Label for foo' },
+   { data: 'bar', label: 
'Label for bar' }
+   ],
+   options: [
+   { data: 'foo', label: 
'Label for foo' },
+   { data: 'bar', label: 
'Label for bar' },
+   { data: 'baz', label: 
'Label for baz' }
+   ]
+   } ),
+   {
+   label: 
'MenuTagMultiselectWidget (initially selected, preset options)',
+   align: 'top'
+   }
+   ),
+   new OO.ui.FieldLayout(
+   new OO.ui.MenuTagMultiselectWidget( {
+   selected: [ 'foo', 'bar' ],
+   allowArbitrary: true
+   } ),
+   {
+   label: 
'MenuTagMultiselectWidget (initially selected, allowArbitrary)',
+   align: 'top'
+   }
+   ),
+   new OO.ui.FieldLayout(
+   new OO.ui.MenuTagMultiselectWidget( {
allowArbitrary: false,
options: [
{ data: 'abc', label: 
'Label for abc' },
diff --git a/src/widgets/MenuTagMultiselectWidget.js 
b/src/widgets/MenuTagMultiselectWidget.js
index ee35b22..5affde6 100644
--- a/src/widgets/MenuTagMultiselectWidget.js
+++ b/src/widgets/MenuTagMultiselectWidget.js
@@ -66,6 +66,11 @@
.append( this.menu.$element );
this.$element
.addClass( 'oo-ui-menuTagMultiselectWidget' );
+   // TagMultiselectWidget already does this, but it doesn't work right 
because this.menu is not yet
+   // set up while the parent constructor runs, and #getAllowedValues 
rejects everything.
+   if ( config.selected ) {
+   this.setValue( config.selected );
+   }
 };
 
 /* Initialization */
@@ -234,6 +239,10 @@
  * @return {string[]} Allowed data values
  */
 OO.ui.MenuTagMultiselectWidget.prototype.getAllowedValues = function () {
+   if ( !this.menu ) {
+   // This is the parent constructor calling us and we're not 
ready yet, this.menu is not set up.
+   return this.allowedValues;
+   }
var menuDatas = this.menu.getItems().map( function ( menuItem ) {
return menuItem.getData();
} );

-- 
To view, visit https://gerrit.wikimedia.org/r/352630
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a62a947f1229bc957de9a79c451f309c4269d3c
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

___
MediaWiki-commits mailing list

[MediaWiki-commits] [Gerrit] oojs/ui[master]: TagMultiselectWidget: Fix Ctrl+Backspace to delete last item

2017-05-08 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352628 )

Change subject: TagMultiselectWidget: Fix Ctrl+Backspace to delete last item
..

TagMultiselectWidget: Fix Ctrl+Backspace to delete last item

Looks like someone removed the function parameters to satisfy ESLint's
complaints about them being unused, without wondering what they were
supposed to be used for. They are documented and they're being passed.

Change-Id: Ie04db7f27bc8b44a45daa3cd1fad26b5a38ea6f4
---
M src/widgets/TagMultiselectWidget.js
1 file changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/28/352628/1

diff --git a/src/widgets/TagMultiselectWidget.js 
b/src/widgets/TagMultiselectWidget.js
index 4722ab2..13b5381 100644
--- a/src/widgets/TagMultiselectWidget.js
+++ b/src/widgets/TagMultiselectWidget.js
@@ -326,7 +326,7 @@
  * a meta key like 'ctrl'
  * @return {boolean} Whether to prevent defaults
  */
-OO.ui.TagMultiselectWidget.prototype.doInputBackspace = function () {
+OO.ui.TagMultiselectWidget.prototype.doInputBackspace = function ( e, 
withMetaKey ) {
var items, item;
 
if (
@@ -337,8 +337,12 @@
// Delete the last item
items = this.getItems();
item = items[ items.length - 1 ];
-   this.input.setValue( item.getData() );
this.removeItems( [ item ] );
+   // If Ctrl/Cmd was pressed, delete item entirely.
+   // Otherwise put it into the text field for editing.
+   if ( !withMetaKey ) {
+   this.input.setValue( item.getData() );
+   }
 
return false;
}

-- 
To view, visit https://gerrit.wikimedia.org/r/352628
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie04db7f27bc8b44a45daa3cd1fad26b5a38ea6f4
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] oojs/ui[master]: TagMultiselectWidget: Fix #addTag return value to match docs

2017-05-08 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/352625 )

Change subject: TagMultiselectWidget: Fix #addTag return value to match docs
..

TagMultiselectWidget: Fix #addTag return value to match docs

Change-Id: I48212e6049e7e9c636bdc0ee63d2cf92f063e999
---
M src/widgets/TagMultiselectWidget.js
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/25/352625/1

diff --git a/src/widgets/TagMultiselectWidget.js 
b/src/widgets/TagMultiselectWidget.js
index 5fc9815..f69361e 100644
--- a/src/widgets/TagMultiselectWidget.js
+++ b/src/widgets/TagMultiselectWidget.js
@@ -604,7 +604,9 @@
newItemWidget = this.createTagItemWidget( data, label );
newItemWidget.toggleValid( isValid );
this.addItems( [ newItemWidget ] );
+   return true;
}
+   return false;
 };
 
 /**

-- 
To view, visit https://gerrit.wikimedia.org/r/352625
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I48212e6049e7e9c636bdc0ee63d2cf92f063e999
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

1 2 >

1 - 100 of 196 matches

Mail list logo