date:20170718

[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[REL1_27]: SECURITY XSS in Special:GlobalGroupPermissions

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: SECURITY XSS in Special:GlobalGroupPermissions
..


SECURITY XSS in Special:GlobalGroupPermissions

The group name was not properly escaped.

Issue discovered by Grunny

In master this is fixed by fadb367ad16a228cc

Bug: T134863
Change-Id: Iad7c5bb32d7fb9c38b1781cce00eec8f1e99f321
---
M includes/specials/SpecialGlobalGroupPermissions.php
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/includes/specials/SpecialGlobalGroupPermissions.php 
b/includes/specials/SpecialGlobalGroupPermissions.php
index 7e3c4b0..61eff25 100644
--- a/includes/specials/SpecialGlobalGroupPermissions.php
+++ b/includes/specials/SpecialGlobalGroupPermissions.php
@@ -145,7 +145,7 @@
if ( $editable ) {
$fields['centralauth-editgroup-name'] = Xml::input( 
'wpGlobalGroupName', 50, $group );
} else {
-   $fields['centralauth-editgroup-name'] = $group;
+   $fields['centralauth-editgroup-name'] = 
htmlspecialchars( $group );
}
 
if( $this->getUser()->isAllowed( 'editinterface' ) ) {
@@ -153,8 +153,8 @@
$fields['centralauth-editgroup-display'] = $this->msg( 
'centralauth-editgroup-display-edit', $group, User::getGroupName( $group ) 
)->parse();
$fields['centralauth-editgroup-member'] = $this->msg( 
'centralauth-editgroup-member-edit', $group, User::getGroupMember( $group ) 
)->parse();
} else {
-   $fields['centralauth-editgroup-display'] = 
User::getGroupName( $group );
-   $fields['centralauth-editgroup-member'] = 
User::getGroupMember( $group );
+   $fields['centralauth-editgroup-display'] = 
htmlspecialchars( User::getGroupName( $group ) );
+   $fields['centralauth-editgroup-member'] = 
htmlspecialchars( User::getGroupMember( $group ) );
}
$fields['centralauth-editgroup-members'] = $this->msg( 
'centralauth-editgroup-members-link', $group, User::getGroupMember( $group ) 
)->parse();
$fields['centralauth-editgroup-restrictions'] = 
$this->buildWikiSetSelector( $group );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iad7c5bb32d7fb9c38b1781cce00eec8f1e99f321
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: REL1_27
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 
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...CentralAuth[REL1_28]: SECURITY XSS in Special:GlobalGroupPermissions

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: SECURITY XSS in Special:GlobalGroupPermissions
..


SECURITY XSS in Special:GlobalGroupPermissions

The group name was not properly escaped.

Issue discovered by Grunny

In master this is fixed by fadb367ad16a228cc

Bug: T134863
Change-Id: Iad7c5bb32d7fb9c38b1781cce00eec8f1e99f321
---
M includes/specials/SpecialGlobalGroupPermissions.php
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/includes/specials/SpecialGlobalGroupPermissions.php 
b/includes/specials/SpecialGlobalGroupPermissions.php
index 63e948f..af274f2 100644
--- a/includes/specials/SpecialGlobalGroupPermissions.php
+++ b/includes/specials/SpecialGlobalGroupPermissions.php
@@ -232,7 +232,7 @@
if ( $editable ) {
$fields['centralauth-editgroup-name'] = Xml::input( 
'wpGlobalGroupName', 50, $group );
} else {
-   $fields['centralauth-editgroup-name'] = $group;
+   $fields['centralauth-editgroup-name'] = 
htmlspecialchars( $group );
}
 
if( $this->getUser()->isAllowed( 'editinterface' ) ) {
@@ -240,8 +240,8 @@
$fields['centralauth-editgroup-display'] = $this->msg( 
'centralauth-editgroup-display-edit', $group, User::getGroupName( $group ) 
)->parse();
$fields['centralauth-editgroup-member'] = $this->msg( 
'centralauth-editgroup-member-edit', $group, User::getGroupMember( $group ) 
)->parse();
} else {
-   $fields['centralauth-editgroup-display'] = 
User::getGroupName( $group );
-   $fields['centralauth-editgroup-member'] = 
User::getGroupMember( $group );
+   $fields['centralauth-editgroup-display'] = 
htmlspecialchars( User::getGroupName( $group ) );
+   $fields['centralauth-editgroup-member'] = 
htmlspecialchars( User::getGroupMember( $group ) );
}
$fields['centralauth-editgroup-members'] = $this->msg( 
'centralauth-editgroup-members-link', $group, User::getGroupMember( $group ) 
)->parse();
$fields['centralauth-editgroup-restrictions'] = 
$this->buildWikiSetSelector( $group );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iad7c5bb32d7fb9c38b1781cce00eec8f1e99f321
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: REL1_28
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 
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...CentralAuth[REL1_27]: SECURITY XSS in Special:GlobalGroupPermissions

2017-07-18 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/366196 )

Change subject: SECURITY XSS in Special:GlobalGroupPermissions
..

SECURITY XSS in Special:GlobalGroupPermissions

The group name was not properly escaped.

Issue discovered by Grunny

In master this is fixed by fadb367ad16a228cc

Bug: T134863
Change-Id: Iad7c5bb32d7fb9c38b1781cce00eec8f1e99f321
---
M includes/specials/SpecialGlobalGroupPermissions.php
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth 
refs/changes/96/366196/1

diff --git a/includes/specials/SpecialGlobalGroupPermissions.php 
b/includes/specials/SpecialGlobalGroupPermissions.php
index 7e3c4b0..61eff25 100644
--- a/includes/specials/SpecialGlobalGroupPermissions.php
+++ b/includes/specials/SpecialGlobalGroupPermissions.php
@@ -145,7 +145,7 @@
if ( $editable ) {
$fields['centralauth-editgroup-name'] = Xml::input( 
'wpGlobalGroupName', 50, $group );
} else {
-   $fields['centralauth-editgroup-name'] = $group;
+   $fields['centralauth-editgroup-name'] = 
htmlspecialchars( $group );
}
 
if( $this->getUser()->isAllowed( 'editinterface' ) ) {
@@ -153,8 +153,8 @@
$fields['centralauth-editgroup-display'] = $this->msg( 
'centralauth-editgroup-display-edit', $group, User::getGroupName( $group ) 
)->parse();
$fields['centralauth-editgroup-member'] = $this->msg( 
'centralauth-editgroup-member-edit', $group, User::getGroupMember( $group ) 
)->parse();
} else {
-   $fields['centralauth-editgroup-display'] = 
User::getGroupName( $group );
-   $fields['centralauth-editgroup-member'] = 
User::getGroupMember( $group );
+   $fields['centralauth-editgroup-display'] = 
htmlspecialchars( User::getGroupName( $group ) );
+   $fields['centralauth-editgroup-member'] = 
htmlspecialchars( User::getGroupMember( $group ) );
}
$fields['centralauth-editgroup-members'] = $this->msg( 
'centralauth-editgroup-members-link', $group, User::getGroupMember( $group ) 
)->parse();
$fields['centralauth-editgroup-restrictions'] = 
$this->buildWikiSetSelector( $group );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad7c5bb32d7fb9c38b1781cce00eec8f1e99f321
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: REL1_27
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[REL1_28]: SECURITY XSS in Special:GlobalGroupPermissions

2017-07-18 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/366195 )

Change subject: SECURITY XSS in Special:GlobalGroupPermissions
..

SECURITY XSS in Special:GlobalGroupPermissions

The group name was not properly escaped.

Issue discovered by Grunny

In master this is fixed by fadb367ad16a228cc

Bug: T134863
Change-Id: Iad7c5bb32d7fb9c38b1781cce00eec8f1e99f321
---
M includes/specials/SpecialGlobalGroupPermissions.php
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth 
refs/changes/95/366195/1

diff --git a/includes/specials/SpecialGlobalGroupPermissions.php 
b/includes/specials/SpecialGlobalGroupPermissions.php
index 63e948f..af274f2 100644
--- a/includes/specials/SpecialGlobalGroupPermissions.php
+++ b/includes/specials/SpecialGlobalGroupPermissions.php
@@ -232,7 +232,7 @@
if ( $editable ) {
$fields['centralauth-editgroup-name'] = Xml::input( 
'wpGlobalGroupName', 50, $group );
} else {
-   $fields['centralauth-editgroup-name'] = $group;
+   $fields['centralauth-editgroup-name'] = 
htmlspecialchars( $group );
}
 
if( $this->getUser()->isAllowed( 'editinterface' ) ) {
@@ -240,8 +240,8 @@
$fields['centralauth-editgroup-display'] = $this->msg( 
'centralauth-editgroup-display-edit', $group, User::getGroupName( $group ) 
)->parse();
$fields['centralauth-editgroup-member'] = $this->msg( 
'centralauth-editgroup-member-edit', $group, User::getGroupMember( $group ) 
)->parse();
} else {
-   $fields['centralauth-editgroup-display'] = 
User::getGroupName( $group );
-   $fields['centralauth-editgroup-member'] = 
User::getGroupMember( $group );
+   $fields['centralauth-editgroup-display'] = 
htmlspecialchars( User::getGroupName( $group ) );
+   $fields['centralauth-editgroup-member'] = 
htmlspecialchars( User::getGroupMember( $group ) );
}
$fields['centralauth-editgroup-members'] = $this->msg( 
'centralauth-editgroup-members-link', $group, User::getGroupMember( $group ) 
)->parse();
$fields['centralauth-editgroup-restrictions'] = 
$this->buildWikiSetSelector( $group );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad7c5bb32d7fb9c38b1781cce00eec8f1e99f321
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: REL1_28
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: CiviCRM submodule update

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: CiviCRM submodule update
..


CiviCRM submodule update

The following change is aesthetic / tidy up only

a9ec2a4 Fix filename case for some api examples

Change-Id: Ic5aa320a24e04382b891c1a1800052bab39515de
---
M civicrm
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/civicrm b/civicrm
index cd5f7a6..260aa96 16
--- a/civicrm
+++ b/civicrm
@@ -1 +1 @@
-Subproject commit cd5f7a64c59f27c9ea0df53c43b4b9a9df1e7b19
+Subproject commit 260aa96fec38199cae6cbe108164a7d8a433fc5c

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5aa320a24e04382b891c1a1800052bab39515de
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Move HashSearchConfig into main codebase

2017-07-18 Thread EBernhardson (Code Review)

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

Change subject: Move HashSearchConfig into main codebase
..

Move HashSearchConfig into main codebase

This was previously only used for test cases, but it will be useful
for the interleaving where we need to build a query a second time
using a slightly different configuration. As such move it into
the primary code base.

Change-Id: I29b3b090385ad70d23aed9ef03bbef21587ce0fa
---
M autoload.php
A includes/HashSearchConfig.php
M tests/unit/CompletionSuggesterTest.php
M tests/unit/ConnectionTest.php
M tests/unit/InterwikiResolverTest.php
M tests/unit/Maintenance/AnalysisConfigBuilderTest.php
M tests/unit/Maintenance/ReindexerTest.php
M tests/unit/Query/FullTextQueryStringQueryBuilder.php
M tests/unit/Query/RegexInSourceFeatureTest.php
M tests/unit/RescoreBuilderTest.php
M tests/unit/TestUtils.php
M tests/unit/UpdaterTest.php
M tests/unit/UtilTest.php
13 files changed, 34 insertions(+), 34 deletions(-)


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

diff --git a/autoload.php b/autoload.php
index e6b67f0..85cdb60 100644
--- a/autoload.php
+++ b/autoload.php
@@ -54,6 +54,7 @@
'CirrusSearch\\ForceSearchIndex' => __DIR__ . 
'/maintenance/forceSearchIndex.php',
'CirrusSearch\\FullTextQueryBuilderProfiles' => __DIR__ . 
'/profiles/FullTextQueryBuilderProfiles.php',
'CirrusSearch\\HTMLCompletionProfileSettings' => __DIR__ . 
'/includes/HTMLCompletionProfileSettings.php',
+   'CirrusSearch\\HashSearchConfig' => __DIR__ . 
'/includes/HashSearchConfig.php',
'CirrusSearch\\Hooks' => __DIR__ . '/includes/Hooks.php',
'CirrusSearch\\InterwikiResolver' => __DIR__ . 
'/includes/InterwikiResolver.php',
'CirrusSearch\\InterwikiResolverFactory' => __DIR__ . 
'/includes/InterwikiResolverFactory.php',
@@ -187,7 +188,6 @@
'CirrusSearch\\Searcher' => __DIR__ . '/includes/Searcher.php',
'CirrusSearch\\SiteMatrixInterwikiResolver' => __DIR__ . 
'/includes/SiteMatrixInterwikiResolver.php',
'CirrusSearch\\Test\\DummyConnection' => __DIR__ . 
'/tests/unit/TestUtils.php',
-   'CirrusSearch\\Test\\HashSearchConfig' => __DIR__ . 
'/tests/unit/TestUtils.php',
'CirrusSearch\\Updater' => __DIR__ . '/includes/Updater.php',
'CirrusSearch\\UserTesting' => __DIR__ . '/includes/UserTesting.php',
'CirrusSearch\\Util' => __DIR__ . '/includes/Util.php',
diff --git a/includes/HashSearchConfig.php b/includes/HashSearchConfig.php
new file mode 100644
index 000..b0db798
--- /dev/null
+++ b/includes/HashSearchConfig.php
@@ -0,0 +1,27 @@
+setSource( $config );
+   }
+
+   /**
+* Allow overriding Wiki ID
+* @return mixed|string
+*/
+   public function getWikiId() {
+   if ( $this->has( '_wikiID' ) ) {
+   return $this->get( '_wikiID' );
+   }
+   return parent::getWikiId();
+   }
+}
diff --git a/tests/unit/CompletionSuggesterTest.php 
b/tests/unit/CompletionSuggesterTest.php
index f40bfde..e741755 100644
--- a/tests/unit/CompletionSuggesterTest.php
+++ b/tests/unit/CompletionSuggesterTest.php
@@ -2,7 +2,6 @@
 
 namespace CirrusSearch;
 
-use CirrusSearch\Test\HashSearchConfig;
 use CirrusSearch\Test\DummyConnection;
 use CirrusSearch\BuildDocument\Completion\SuggestBuilder;
 
diff --git a/tests/unit/ConnectionTest.php b/tests/unit/ConnectionTest.php
index 1c747b5..99f3e43 100644
--- a/tests/unit/ConnectionTest.php
+++ b/tests/unit/ConnectionTest.php
@@ -2,8 +2,6 @@
 
 namespace CirrusSearch;
 
-use CirrusSearch\Test\HashSearchConfig;
-
 /**
  * Make sure cirrus doens't break any hooks.
  *
diff --git a/tests/unit/InterwikiResolverTest.php 
b/tests/unit/InterwikiResolverTest.php
index 6bd7723..e7cb30e 100644
--- a/tests/unit/InterwikiResolverTest.php
+++ b/tests/unit/InterwikiResolverTest.php
@@ -5,6 +5,7 @@
 use MediaWiki\MediaWikiServices;
 use CirrusSearch\CirrusTestCase;
 use CirrusSearch\CirrusConfigInterwikiResolver;
+use CirrusSearch\HashSearchConfig;
 use CirrusSearch\SiteMatrixInterwikiResolver;
 use CirrusSearch\InterwikiResolverFactory;
 
diff --git a/tests/unit/Maintenance/AnalysisConfigBuilderTest.php 
b/tests/unit/Maintenance/AnalysisConfigBuilderTest.php
index 798c898..ff2f37a 100644
--- a/tests/unit/Maintenance/AnalysisConfigBuilderTest.php
+++ b/tests/unit/Maintenance/AnalysisConfigBuilderTest.php
@@ -3,7 +3,7 @@
 namespace CirrusSearch\Tests\Maintenance;
 
 use CirrusSearch\Maintenance\AnalysisConfigBuilder;
-use CirrusSearch\Test\HashSearchConfig;
+use CirrusSearch\HashSearchConfig;
 use CirrusSearch\CirrusTestCase;
 
 /**
diff --git a/tests/unit/Maintenance/ReindexerTest.php 
b/tests/unit/Maintenance/ReindexerTest.php
index 62c93e8..88f0019 100644
--- a/tests/unit/Maintenance/ReindexerTest.php
+++

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Team Draft interleaved AB testing

2017-07-18 Thread EBernhardson (Code Review)

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

Change subject: Team Draft interleaved AB testing
..

Team Draft interleaved AB testing

Adjusts primary full text search handing to support team
draft interleaving via wgCirrusSearchUserTesting triggers.
This method of AB testing search changes is significantly
more robust to noise, as all users are in both the control
and test buckets. See linked ticket/papers for more information.

Implementation is perhaps not perfect, but for AB testing should
be sufficient. Specifically a way to decorate a ResultSet, rather
than copying all the data over into an extended class would be
useful.

Bug: T150032
Change-Id: I936d2432cc94a67d373f9ca6550a0f127bf1
---
M CirrusSearch.php
M autoload.php
M docs/settings.txt
M includes/CirrusSearch.php
A includes/Search/InterleavedResultSet.php
M includes/Search/ResultSet.php
A includes/Search/SearchMetricsProvider.php
A includes/Search/TeamDraftInterleaver.php
M includes/Searcher.php
A tests/unit/Search/TeamDraftInterleaverTest.php
10 files changed, 320 insertions(+), 9 deletions(-)


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

diff --git a/CirrusSearch.php b/CirrusSearch.php
index 19b03a2..6e499e6 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -1477,6 +1477,15 @@
  */
 $wgCirrusSearchEnableArchive = false;
 
+/**
+ * Map of configuration variable name to value used to override cirrus config
+ * during interleaved full text search. Generally this should *not* be set
+ * directly, and instead set via $wgCirrusSearchUserTesting triggers. It is
+ * useful to perform Team-Draft interleaved search experiments to compare the
+ * performance of two different search configurations.
+ */
+$wgCirrusSearchInterleaveConfig = [];
+
 /*
  * Please update docs/settings.txt if you add new values!
  */
diff --git a/autoload.php b/autoload.php
index 85cdb60..1cbae77 100644
--- a/autoload.php
+++ b/autoload.php
@@ -163,6 +163,7 @@
'CirrusSearch\\Search\\IdResultsType' => __DIR__ . 
'/includes/Search/ResultsType.php',
'CirrusSearch\\Search\\IncomingLinksFunctionScoreBuilder' => __DIR__ . 
'/includes/Search/RescoreBuilders.php',
'CirrusSearch\\Search\\IntegerIndexField' => __DIR__ . 
'/includes/Search/IntegerIndexField.php',
+   'CirrusSearch\\Search\\InterleavedResultSet' => __DIR__ . 
'/includes/Search/InterleavedResultSet.php',
'CirrusSearch\\Search\\InvalidRescoreProfileException' => __DIR__ . 
'/includes/Search/RescoreBuilders.php',
'CirrusSearch\\Search\\KeywordIndexField' => __DIR__ . 
'/includes/Search/KeywordIndexField.php',
'CirrusSearch\\Search\\LangWeightFunctionScoreBuilder' => __DIR__ . 
'/includes/Search/RescoreBuilders.php',
@@ -180,8 +181,10 @@
'CirrusSearch\\Search\\SatuFunctionScoreBuilder' => __DIR__ . 
'/includes/Search/RescoreBuilders.php',
'CirrusSearch\\Search\\ScriptScoreFunctionScoreBuilder' => __DIR__ . 
'/includes/Search/RescoreBuilders.php',
'CirrusSearch\\Search\\SearchContext' => __DIR__ . 
'/includes/Search/SearchContext.php',
+   'CirrusSearch\\Search\\SearchMetricsProvider' => __DIR__ . 
'/includes/Search/SearchMetricsProvider.php',
'CirrusSearch\\Search\\ShortTextIndexField' => __DIR__ . 
'/includes/Search/ShortTextIndexField.php',
'CirrusSearch\\Search\\SourceTextIndexField' => __DIR__ . 
'/includes/Search/SourceTextIndexField.php',
+   'CirrusSearch\\Search\\TeamDraftInterleaver' => __DIR__ . 
'/includes/Search/TeamDraftInterleaver.php',
'CirrusSearch\\Search\\TextIndexField' => __DIR__ . 
'/includes/Search/TextIndexField.php',
'CirrusSearch\\Search\\TitleHelper' => __DIR__ . 
'/includes/Search/TitleHelper.php',
'CirrusSearch\\Search\\TitleResultsType' => __DIR__ . 
'/includes/Search/ResultsType.php',
diff --git a/docs/settings.txt b/docs/settings.txt
index 215e48e..55631ad 100644
--- a/docs/settings.txt
+++ b/docs/settings.txt
@@ -1565,3 +1565,14 @@
 
 Whether deletes are indexed for archive search when page is deleted. Note that 
searching
 for archived pages can be done by manually indexing them too.
+
+; $wgCirrusSearchInterleaveConfig
+
+Default:
+   $wgCirrusSearchInterleaveConfig = [];
+
+Map of configuration variable name to value used to override cirrus config
+during interleaved full text search. Generally tis should *not* be set
+directly, and instead set via $wgCirrusSearchUserTesting triggers. It is
+usefull to perform Team-Draft interleaved search experiments to compare the
+performance of two different search configurations.
diff --git a/includes/CirrusSearch.php b/includes/CirrusSearch.php
index 866a8dc..cdfc8d4 100644
--- a/includes/CirrusSearch.php
+++ b/includes/CirrusSearch.php
@@ -5,6 +5,7 @@
 use CirrusSearch\InterwikiSearcher;
 use CirrusSearch\InterwikiResolver;
 use

[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[REL1_29]: SECURITY: Use getFullUrlForRedirect() in Special:CentralAuth...

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: SECURITY: Use getFullUrlForRedirect() in 
Special:CentralAuthAutoLogin/setCookies
..


SECURITY: Use getFullUrlForRedirect() in Special:CentralAuthAutoLogin/setCookies

This ensures that interwiki links cannot be used as returnto values.

This is triggerable by going to
mywiki.com/wiki/Special:Userlogin?returnto=google:Foo on a wiki
with centralauth where the user is already logged in.

Bug: T134931
Change-Id: Ida6d1c04994295de827d6b52e43032005d49c922
---
M includes/specials/SpecialCentralAutoLogin.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/specials/SpecialCentralAutoLogin.php 
b/includes/specials/SpecialCentralAutoLogin.php
index 57ff39e..71b0e7a 100644
--- a/includes/specials/SpecialCentralAutoLogin.php
+++ b/includes/specials/SpecialCentralAutoLogin.php
@@ -534,7 +534,7 @@
$returnToQuery = array();
}
 
-   $redirectUrl = $returnToTitle->getFullURL( 
$returnToQuery );
+   $redirectUrl = 
$returnToTitle->getFullUrlForRedirect( $returnToQuery );
 
$script .= "\n" . 'location.href = ' . 
Xml::encodeJsVar( $redirectUrl ) . ';';
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida6d1c04994295de827d6b52e43032005d49c922
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: REL1_29
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 
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...CentralAuth[REL1_27]: SECURITY: Use getFullUrlForRedirect() in Special:CentralAuth...

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: SECURITY: Use getFullUrlForRedirect() in 
Special:CentralAuthAutoLogin/setCookies
..


SECURITY: Use getFullUrlForRedirect() in Special:CentralAuthAutoLogin/setCookies

This ensures that interwiki links cannot be used as returnto values.

This is triggerable by going to
mywiki.com/wiki/Special:Userlogin?returnto=google:Foo on a wiki
with centralauth where the user is already logged in.

Note, this change requires at least MediaWiki 1.27.2. This fix
makes this extension incompatible with MediaWiki 1.27.1 and
MediaWiki 1.27.0.

Bug: T134931
Change-Id: Ida6d1c04994295de827d6b52e43032005d49c922
---
M includes/specials/SpecialCentralAutoLogin.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/specials/SpecialCentralAutoLogin.php 
b/includes/specials/SpecialCentralAutoLogin.php
index 56b2dc3..6608ea8 100644
--- a/includes/specials/SpecialCentralAutoLogin.php
+++ b/includes/specials/SpecialCentralAutoLogin.php
@@ -526,7 +526,7 @@
$returnToQuery = array();
}
 
-   $redirectUrl = $returnToTitle->getFullURL( 
$returnToQuery );
+   $redirectUrl = 
$returnToTitle->getFullUrlForRedirect( $returnToQuery );
 
$script .= "\n" . 'location.href = ' . 
Xml::encodeJsVar( $redirectUrl ) . ';';
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida6d1c04994295de827d6b52e43032005d49c922
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: REL1_27
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 
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...CentralAuth[REL1_28]: SECURITY: Use getFullUrlForRedirect() in Special:CentralAuth...

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: SECURITY: Use getFullUrlForRedirect() in 
Special:CentralAuthAutoLogin/setCookies
..


SECURITY: Use getFullUrlForRedirect() in Special:CentralAuthAutoLogin/setCookies

This ensures that interwiki links cannot be used as returnto values.

This is triggerable by going to
mywiki.com/wiki/Special:Userlogin?returnto=google:Foo on a wiki
with centralauth where the user is already logged in.

Note: This requires at least 1.28.1. This patch makes this
extension incompatible with 1.28.0.

Bug: T134931
Change-Id: Ida6d1c04994295de827d6b52e43032005d49c922
---
M includes/specials/SpecialCentralAutoLogin.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/specials/SpecialCentralAutoLogin.php 
b/includes/specials/SpecialCentralAutoLogin.php
index 4befd4c..687a8ad 100644
--- a/includes/specials/SpecialCentralAutoLogin.php
+++ b/includes/specials/SpecialCentralAutoLogin.php
@@ -520,7 +520,7 @@
$returnToQuery = array();
}
 
-   $redirectUrl = $returnToTitle->getFullURL( 
$returnToQuery );
+   $redirectUrl = 
$returnToTitle->getFullUrlForRedirect( $returnToQuery );
 
$script .= "\n" . 'location.href = ' . 
Xml::encodeJsVar( $redirectUrl ) . ';';
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida6d1c04994295de827d6b52e43032005d49c922
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: REL1_28
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 
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] wikimedia...crm[master]: CiviCRM submodule update

2017-07-18 Thread Eileen (Code Review)

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

Change subject: CiviCRM submodule update
..

CiviCRM submodule update

The following change is aesthetic / tidy up only

a9ec2a4 Fix filename case for some api examples

Change-Id: Ic5aa320a24e04382b891c1a1800052bab39515de
---
M civicrm
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/92/366192/1

diff --git a/civicrm b/civicrm
index cd5f7a6..260aa96 16
--- a/civicrm
+++ b/civicrm
@@ -1 +1 @@
-Subproject commit cd5f7a64c59f27c9ea0df53c43b4b9a9df1e7b19
+Subproject commit 260aa96fec38199cae6cbe108164a7d8a433fc5c

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[REL1_27]: SECURITY: Use getFullUrlForRedirect() in Special:CentralAuth...

2017-07-18 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/366191 )

Change subject: SECURITY: Use getFullUrlForRedirect() in 
Special:CentralAuthAutoLogin/setCookies
..

SECURITY: Use getFullUrlForRedirect() in Special:CentralAuthAutoLogin/setCookies

This ensures that interwiki links cannot be used as returnto values.

This is triggerable by going to
mywiki.com/wiki/Special:Userlogin?returnto=google:Foo on a wiki
with centralauth where the user is already logged in.

Note, this change requires at least MediaWiki 1.27.2. This fix
makes this extension incompatible with MediaWiki 1.27.1 and
MediaWiki 1.27.0.

Bug: T134931
Change-Id: Ida6d1c04994295de827d6b52e43032005d49c922
---
M includes/specials/SpecialCentralAutoLogin.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth 
refs/changes/91/366191/1

diff --git a/includes/specials/SpecialCentralAutoLogin.php 
b/includes/specials/SpecialCentralAutoLogin.php
index 56b2dc3..6608ea8 100644
--- a/includes/specials/SpecialCentralAutoLogin.php
+++ b/includes/specials/SpecialCentralAutoLogin.php
@@ -526,7 +526,7 @@
$returnToQuery = array();
}
 
-   $redirectUrl = $returnToTitle->getFullURL( 
$returnToQuery );
+   $redirectUrl = 
$returnToTitle->getFullUrlForRedirect( $returnToQuery );
 
$script .= "\n" . 'location.href = ' . 
Xml::encodeJsVar( $redirectUrl ) . ';';
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida6d1c04994295de827d6b52e43032005d49c922
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: REL1_27
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Support custom offsets from SearchResultSet

2017-07-18 Thread EBernhardson (Code Review)

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

Change subject: Support custom offsets from SearchResultSet
..

Support custom offsets from SearchResultSet

Work to support interleaved AB testing of search will display
interleaved results of two search configurations on the first page of
results, but standard results on all pages other than the first page.
This means that while 20 results may be requested, the next 'new' result
of the primary query may be at position 10. Allow the SearchResultSet
to declare what the new offset is.

Bug: T150032
Change-Id: I14c0c33249fcdb66f72f5966e2aa72781a34daee
---
M includes/search/SearchResultSet.php
M includes/specials/SpecialSearch.php
2 files changed, 19 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/90/366190/1

diff --git a/includes/search/SearchResultSet.php 
b/includes/search/SearchResultSet.php
index 978db27..89d2299 100644
--- a/includes/search/SearchResultSet.php
+++ b/includes/search/SearchResultSet.php
@@ -264,4 +264,14 @@
$result->setExtensionData( $this->extraData[$id] );
return $this->extraData[$id];
}
+
+   /**
+* @return int|null The offset the current page starts at. Typically
+*  this should be null to allow the UI to decide on its own, but in
+*  special cases like interleaved AB tests specifying explicitly is
+*  necessary.
+*/
+   public function getOffset() {
+   return null;
+   }
 }
diff --git a/includes/specials/SpecialSearch.php 
b/includes/specials/SpecialSearch.php
index e89dbc9..b739c34 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -436,9 +436,17 @@
 
// prev/next links
if ( $totalRes > $this->limit || $this->offset ) {
+   // Allow matches to define the correct offset, as 
interleaved
+   // AB testing may require a different next page offset.
+   if ( $textMatches && $textMatches->getOffset() !== null 
) {
+   $offset = $textMatches->getOffset();
+   } else {
+   $offset = $this->offset;
+   }
+
$prevnext = $this->getLanguage()->viewPrevNext(
$this->getPageTitle(),
-   $this->offset,
+   $offset,
$this->limit,
$this->powerSearchOptions() + [ 'search' => 
$term ],
$this->limit + $this->offset >= $totalRes

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[REL1_28]: SECURITY: Use getFullUrlForRedirect() in Special:CentralAuth...

2017-07-18 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/366189 )

Change subject: SECURITY: Use getFullUrlForRedirect() in 
Special:CentralAuthAutoLogin/setCookies
..

SECURITY: Use getFullUrlForRedirect() in Special:CentralAuthAutoLogin/setCookies

This ensures that interwiki links cannot be used as returnto values.

This is triggerable by going to
mywiki.com/wiki/Special:Userlogin?returnto=google:Foo on a wiki
with centralauth where the user is already logged in.

Note: This requires at least 1.28.1. This patch makes this
extension incompatible with 1.28.0.

Bug: T134931
Change-Id: Ida6d1c04994295de827d6b52e43032005d49c922
---
M includes/specials/SpecialCentralAutoLogin.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth 
refs/changes/89/366189/1

diff --git a/includes/specials/SpecialCentralAutoLogin.php 
b/includes/specials/SpecialCentralAutoLogin.php
index 4befd4c..687a8ad 100644
--- a/includes/specials/SpecialCentralAutoLogin.php
+++ b/includes/specials/SpecialCentralAutoLogin.php
@@ -520,7 +520,7 @@
$returnToQuery = array();
}
 
-   $redirectUrl = $returnToTitle->getFullURL( 
$returnToQuery );
+   $redirectUrl = 
$returnToTitle->getFullUrlForRedirect( $returnToQuery );
 
$script .= "\n" . 'location.href = ' . 
Xml::encodeJsVar( $redirectUrl ) . ';';
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida6d1c04994295de827d6b52e43032005d49c922
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: REL1_28
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[REL1_29]: SECURITY: Use getFullUrlForRedirect() in Special:CentralAuth...

2017-07-18 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/366188 )

Change subject: SECURITY: Use getFullUrlForRedirect() in 
Special:CentralAuthAutoLogin/setCookies
..

SECURITY: Use getFullUrlForRedirect() in Special:CentralAuthAutoLogin/setCookies

This ensures that interwiki links cannot be used as returnto values.

This is triggerable by going to
mywiki.com/wiki/Special:Userlogin?returnto=google:Foo on a wiki
with centralauth where the user is already logged in.

Bug: T134931
Change-Id: Ida6d1c04994295de827d6b52e43032005d49c922
---
M includes/specials/SpecialCentralAutoLogin.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth 
refs/changes/88/366188/1

diff --git a/includes/specials/SpecialCentralAutoLogin.php 
b/includes/specials/SpecialCentralAutoLogin.php
index 57ff39e..71b0e7a 100644
--- a/includes/specials/SpecialCentralAutoLogin.php
+++ b/includes/specials/SpecialCentralAutoLogin.php
@@ -534,7 +534,7 @@
$returnToQuery = array();
}
 
-   $redirectUrl = $returnToTitle->getFullURL( 
$returnToQuery );
+   $redirectUrl = 
$returnToTitle->getFullUrlForRedirect( $returnToQuery );
 
$script .= "\n" . 'location.href = ' . 
Xml::encodeJsVar( $redirectUrl ) . ';';
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida6d1c04994295de827d6b52e43032005d49c922
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: REL1_29
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[master]: SECURITY: Use getFullUrlForRedirect() in Special:CentralAuth...

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: SECURITY: Use getFullUrlForRedirect() in 
Special:CentralAuthAutoLogin/setCookies
..


SECURITY: Use getFullUrlForRedirect() in Special:CentralAuthAutoLogin/setCookies

This ensures that interwiki links cannot be used as returnto values.

This is triggerable by going to
mywiki.com/wiki/Special:Userlogin?returnto=google:Foo on a wiki
with centralauth where the user is already logged in.

Bug: T134931
Change-Id: Ida6d1c04994295de827d6b52e43032005d49c922
---
M includes/specials/SpecialCentralAutoLogin.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/specials/SpecialCentralAutoLogin.php 
b/includes/specials/SpecialCentralAutoLogin.php
index aa96795..4c3264e 100644
--- a/includes/specials/SpecialCentralAutoLogin.php
+++ b/includes/specials/SpecialCentralAutoLogin.php
@@ -540,7 +540,7 @@
$returnToQuery = [];
}
 
-   $redirectUrl = $returnToTitle->getFullURL( 
$returnToQuery );
+   $redirectUrl = 
$returnToTitle->getFullUrlForRedirect( $returnToQuery );
 
$script .= "\n" . 'location.href = ' . 
Xml::encodeJsVar( $redirectUrl ) . ';';
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida6d1c04994295de827d6b52e43032005d49c922
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 
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...CentralAuth[master]: SECURITY: Use getFullUrlForRedirect() in Special:CentralAuth...

2017-07-18 Thread Brian Wolff (Code Review)

Brian Wolff has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/366187 )

Change subject: SECURITY: Use getFullUrlForRedirect() in 
Special:CentralAuthAutoLogin/setCookies
..

SECURITY: Use getFullUrlForRedirect() in Special:CentralAuthAutoLogin/setCookies

This ensures that interwiki links cannot be used as returnto values.

This is triggerable by going to
mywiki.com/wiki/Special:Userlogin?returnto=google:Foo on a wiki
with centralauth where the user is already logged in.

Bug: T134931
Change-Id: Ida6d1c04994295de827d6b52e43032005d49c922
---
M includes/specials/SpecialCentralAutoLogin.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth 
refs/changes/87/366187/1

diff --git a/includes/specials/SpecialCentralAutoLogin.php 
b/includes/specials/SpecialCentralAutoLogin.php
index aa96795..4c3264e 100644
--- a/includes/specials/SpecialCentralAutoLogin.php
+++ b/includes/specials/SpecialCentralAutoLogin.php
@@ -540,7 +540,7 @@
$returnToQuery = [];
}
 
-   $redirectUrl = $returnToTitle->getFullURL( 
$returnToQuery );
+   $redirectUrl = 
$returnToTitle->getFullUrlForRedirect( $returnToQuery );
 
$script .= "\n" . 'location.href = ' . 
Xml::encodeJsVar( $redirectUrl ) . ';';
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida6d1c04994295de827d6b52e43032005d49c922
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 

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

[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: [WIP] CiviCRM 4.7.23

2017-07-18 Thread Eileen (Code Review)

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

Change subject: [WIP] CiviCRM 4.7.23
..

[WIP] CiviCRM 4.7.23

WMF patches:
af6823f Add script for compiling deployment repo
2d975a4 Deployment file adds: gitreview, settings.location, readme, submodules
3b751ca Do not give validation error on address with no location_type.
b3f1db6 CRM-19752 Fix slow query on contribution dash.
5197358 CRM-19752 Fix slow query on contribution search.
eaa0a29 Hack out version & extension checks.
019b7fc Fix custom fields update to work regardless of permissions
8726c42 wmf-sunset-patch alter exception behaviour
98448f7 Increase time out while doing exports
03ec55d Return more rows per query and use unbuffered query to manage the memory
3f6fa9d Merge from master :Include custom fields in default export
c1c5d37 wmf-sunset patch skip process greetings on contact create
b98aa28 wmf-sunset patch add extra columns to contribution recur tab
5465d48 wmf: CRM-17158 block empty searches unless deliberate
dd34ea5 wmf: CRM-10700 use DELETE FROM instead of TRUNCATE
c04c15d wmf: CRM-17157 allow more than 2 decimal places in currency

In packages:
2fc1a3e Revert "Fix mysqli_free and update DB_DataObject free to what is in 
their repo and port mollux change to DB.php for free"
add8fe8 CRM-17156 log user detail in queries to track down long queries

Change-Id: I8045686a0b7c4943ae636b06daea49c98369f61f
---
M CRM/ACL/Page/ACL.php
M CRM/ACL/Page/ACLBasic.php
M CRM/ACL/Page/EntityRole.php
M CRM/Activity/BAO/Activity.php
M CRM/Activity/BAO/Query.php
M CRM/Activity/Form/ActivityFilter.php
M CRM/Activity/Page/AJAX.php
M CRM/Activity/Selector/Search.php
M CRM/Activity/Tokens.php
M CRM/Admin/Form/Options.php
M CRM/Admin/Form/Preferences/Display.php
A CRM/Admin/Form/Setting/Case.php
M CRM/Admin/Form/Setting/Localization.php
M CRM/Admin/Page/AJAX.php
M CRM/Case/BAO/Case.php
M CRM/Case/BAO/CaseType.php
M CRM/Case/Info.php
M CRM/Case/XMLProcessor/Process.php
M CRM/Case/XMLRepository.php
M CRM/Case/xml/Menu/Case.xml
M CRM/Case/xml/configuration.sample/Settings.xml
M CRM/Contact/BAO/GroupContactCache.php
M CRM/Contact/BAO/Query.php
M CRM/Contact/Form/Contact.php
M CRM/Contact/Form/Edit/TagsAndGroups.php
M CRM/Contact/Import/Parser/Contact.php
M CRM/Contact/Page/DedupeFind.php
M CRM/Contact/Page/DedupeRules.php
M CRM/Contribute/BAO/Contribution.php
M CRM/Contribute/BAO/Query.php
M CRM/Contribute/DAO/Contribution.php
M CRM/Contribute/Form/AdditionalPayment.php
M CRM/Contribute/Form/Contribution.php
M CRM/Contribute/Form/Contribution/Confirm.php
M CRM/Contribute/Form/ContributionBase.php
M CRM/Contribute/Form/ContributionPage/Amount.php
M CRM/Contribute/Form/SoftCredit.php
M CRM/Contribute/Form/Task/Invoice.php
M CRM/Contribute/Page/ManagePremiums.php
M CRM/Contribute/Tokens.php
M CRM/Core/Action.php
M CRM/Core/BAO/Address.php
M CRM/Core/BAO/CustomGroup.php
M CRM/Core/BAO/File.php
M CRM/Core/BAO/FinancialTrxn.php
M CRM/Core/BAO/Navigation.php
M CRM/Core/BAO/OptionGroup.php
M CRM/Core/BAO/SchemaHandler.php
M CRM/Core/BAO/Setting.php
M CRM/Core/BAO/Tag.php
M CRM/Core/DAO.php
M CRM/Core/Form.php
M CRM/Core/Form/Date.php
M CRM/Core/Form/Renderer.php
M CRM/Core/I18n.php
M CRM/Core/Page/Basic.php
M CRM/Core/Payment/BaseIPN.php
M CRM/Core/Permission.php
M CRM/Core/SelectValues.php
M CRM/Core/xml/Menu/Misc.xml
M CRM/Custom/Form/CustomDataByType.php
M CRM/Dedupe/Merger.php
M CRM/Event/BAO/Event.php
M CRM/Event/BAO/Participant.php
M CRM/Event/Form/Registration/AdditionalParticipant.php
M CRM/Event/Form/Registration/ParticipantConfirm.php
M CRM/Event/Import/Parser/Participant.php
M CRM/Event/Tokens.php
M CRM/Extension/ClassLoader.php
M CRM/Extension/System.php
M CRM/Financial/BAO/FinancialItem.php
M CRM/Financial/BAO/FinancialTypeAccount.php
M CRM/Financial/Page/FinancialAccount.php
M CRM/Financial/Page/FinancialBatch.php
M CRM/Financial/Page/FinancialType.php
M CRM/Logging/Schema.php
M CRM/Mailing/BAO/Mailing.php
M CRM/Mailing/Event/BAO/Opened.php
M CRM/Mailing/Event/BAO/Resubscribe.php
M CRM/Mailing/Event/BAO/Subscribe.php
M CRM/Member/ActionMapping.php
M CRM/Member/BAO/Membership.php
M CRM/Member/Form.php
M CRM/Member/Form/Membership.php
M CRM/Member/Form/MembershipType.php
M CRM/Member/Page/DashBoard.php
M CRM/Member/Page/MembershipStatus.php
M CRM/Member/Tokens.php
M CRM/PCP/Page/PCP.php
M CRM/Pledge/BAO/PledgePayment.php
M CRM/Price/BAO/PriceField.php
M CRM/Price/BAO/PriceSet.php
M CRM/Price/Form/Set.php
M CRM/Price/Page/Option.php
M CRM/Report/Form.php
M CRM/Report/Form/Activity.php
M CRM/Report/Form/Contribute/DeferredRevenue.php
M CRM/Report/Form/Mailing/Opened.php
M CRM/Tag/Form/Edit.php
A CRM/Upgrade/4.7.23.msg_template/civicrm_msg_template.tpl
A 
CRM/Upgrade/4.7.23.msg_template/message_templates/contribution_invoice_receipt_html.tpl
M CRM/Upgrade/Incremental/Base.php
M CRM/Upgrade/Incremental/php/FourSeven.php
M

[MediaWiki-commits] [Gerrit] operations/puppet[production]: rancid: change the rsync direction

2017-07-18 Thread Dzahn (Code Review)

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

Change subject: rancid: change the rsync direction
..


rancid: change the rsync direction

Copy data back from netmon2001 after netmon1002 has been reinstalled.

Bug: T159756
Change-Id: Icf9f1fa4f64c8da1183af321f736cf100806968f
---
M modules/role/manifests/rancid.pp
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/role/manifests/rancid.pp b/modules/role/manifests/rancid.pp
index 804bd5e..bb3e70a 100644
--- a/modules/role/manifests/rancid.pp
+++ b/modules/role/manifests/rancid.pp
@@ -13,8 +13,8 @@
 rsync::quickdatacopy { 'var-lib-rancid':
   ensure  => present,
   auto_sync   => false,
-  source_host => 'netmon1002.wikimedia.org',
-  dest_host   => 'netmon2001.wikimedia.org',
+  source_host => 'netmon2001.wikimedia.org',
+  dest_host   => 'netmon1002.wikimedia.org',
   module_path => '/var/lib/rancid',
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icf9f1fa4f64c8da1183af321f736cf100806968f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
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]: rancid: change the rsync direction

2017-07-18 Thread Dzahn (Code Review)

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

Change subject: rancid: change the rsync direction
..

rancid: change the rsync direction

Copy data back from netmon2001 after netmon1002 has been reinstalled.

Bug: T159756
Change-Id: Icf9f1fa4f64c8da1183af321f736cf100806968f
---
M modules/role/manifests/rancid.pp
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/85/366185/1

diff --git a/modules/role/manifests/rancid.pp b/modules/role/manifests/rancid.pp
index 804bd5e..bb3e70a 100644
--- a/modules/role/manifests/rancid.pp
+++ b/modules/role/manifests/rancid.pp
@@ -13,8 +13,8 @@
 rsync::quickdatacopy { 'var-lib-rancid':
   ensure  => present,
   auto_sync   => false,
-  source_host => 'netmon1002.wikimedia.org',
-  dest_host   => 'netmon2001.wikimedia.org',
+  source_host => 'netmon2001.wikimedia.org',
+  dest_host   => 'netmon1002.wikimedia.org',
   module_path => '/var/lib/rancid',
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf9f1fa4f64c8da1183af321f736cf100806968f
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]: Revert "rancid: switch active server to netmon2001"

2017-07-18 Thread Dzahn (Code Review)

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

Change subject: Revert "rancid: switch active server to netmon2001"
..


Revert "rancid: switch active server to netmon2001"

This reverts commit 08542d1249f4d31fce32c1504c42e094422a3407.

netmon1002 has been reinstalled, so it could go back,
but more importantly rancid can't connect to routers/switches
from here but it can from netmon1002 ?

Change-Id: I32a4fc768630a399cd0824f25e95ed9c47713a8d
---
M hieradata/common.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 93a9497..8b92f37 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -462,7 +462,7 @@
 install_server: install1002.wikimedia.org
 install_server_failover: install2002.wikimedia.org
 
-netmon_server: netmon2001.wikimedia.org
+netmon_server: netmon1002.wikimedia.org
 
 # Etcd client global configuration
 etcd_client_srv_domain: "conftool.%{::site}.wmnet"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I32a4fc768630a399cd0824f25e95ed9c47713a8d
Gerrit-PatchSet: 3
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/core[master]: RCFilters: Emphasize UI when saved query is loaded

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: RCFilters: Emphasize UI when saved query is loaded
..


RCFilters: Emphasize UI when saved query is loaded

Bug: T169063
Change-Id: Ia300ca7bb4afb7d8e247e57e53ecff826ddf0d7e
---
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
4 files changed, 38 insertions(+), 2 deletions(-)

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



diff --git 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
index 420bb44..7ee601f 100644
--- 
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
+++ 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
@@ -1,3 +1,5 @@
+@import 'mediawiki.mixins';
+
 .mw-rcfilters-ui-filterTagMultiselectWidget {
max-width: none;
 
@@ -17,6 +19,14 @@
margin-top: 1.6em;
}
 
+   .oo-ui-tagMultiselectWidget.oo-ui-widget-enabled 
&-animate.oo-ui-tagMultiselectWidget-handle {
+   .transition( background-color 500ms ease-out );
+   }
+
+   .oo-ui-tagMultiselectWidget.oo-ui-widget-enabled 
&-emphasize.oo-ui-tagMultiselectWidget-handle {
+   background-color: #eaf3ff; // Accent90
+   }
+
&-wrapper {
.mw-rcfilters-ui-table {
margin-top: 0.3em;
@@ -29,7 +39,8 @@
}
 
&-savedQueryTitle {
-   color: #72777d;
+   color: #222; // Base10
+   font-weight: bold;
margin-left: 1em;
}
}
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 dcada85..7789b55 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
@@ -378,6 +378,10 @@
!this.isEmpty() &&
!this.matchingQuery
);
+
+   if ( this.matchingQuery ) {
+   this.emphasize();
+   }
}
};
 
@@ -588,6 +592,26 @@
}
};
 
+   mw.rcfilters.ui.FilterTagMultiselectWidget.prototype.emphasize = 
function () {
+   if (
+   !this.$handle.hasClass( 
'mw-rcfilters-ui-filterTagMultiselectWidget-animate' )
+   ) {
+   this.$handle
+   .addClass( 
'mw-rcfilters-ui-filterTagMultiselectWidget-emphasize' )
+   .addClass( 
'mw-rcfilters-ui-filterTagMultiselectWidget-animate' );
+
+   setTimeout( function () {
+   this.$handle
+   .removeClass( 
'mw-rcfilters-ui-filterTagMultiselectWidget-emphasize' );
+
+   setTimeout( function () {
+   this.$handle
+   .removeClass( 
'mw-rcfilters-ui-filterTagMultiselectWidget-animate' );
+   }.bind( this ), 1000 );
+   }.bind( this ), 500 );
+
+   }
+   };
/**
 * Scroll the element to top within its container
 *
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
index a748063..e36067d 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
@@ -52,7 +52,6 @@
this.$element.append(
this.savedLinksListWidget.$element
);
-
}
 
$bottom = $( '' )
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 3b5e7d9..27a21d6 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.SavedLinksListWidget.js
+++

[MediaWiki-commits] [Gerrit] mediawiki...ApprovedRevs[master]: ApprovedRevs only recognises per-page rights, not group rights

2017-07-18 Thread Yaron Koren (Code Review)

Yaron Koren has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/366171 )

Change subject: ApprovedRevs only recognises per-page rights, not group rights
..


ApprovedRevs only recognises per-page rights, not group rights

When testing to see if a user has the approverevisions right, the only
check is of $title->userCan('approverevisions'). This check, though
has hooks that allow other code to alter the value returned on a
per-page basis.

Instead, $wgUser->isAllowed('approverevisions') should be used since
it is a general check on the approverevisions right.

Change-Id: I77e3c4bbe0b73b6d3992eaf41dbc6eec2ebbc82f
---
M ApprovedRevs_body.php
1 file changed, 4 insertions(+), 3 deletions(-)

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



diff --git a/ApprovedRevs_body.php b/ApprovedRevs_body.php
index f59a955..c384590 100644
--- a/ApprovedRevs_body.php
+++ b/ApprovedRevs_body.php
@@ -143,7 +143,8 @@
}
 
public static function userCanApprove( $title ) {
-   global $egApprovedRevsSelfOwnedNamespaces;
+   global $egApprovedRevsSelfOwnedNamespaces, $wgUser;
+   $permission = 'approverevisions';
 
// $mUserCanApprove is a static variable used for
// "caching" the result of this function, so that
@@ -152,7 +153,8 @@
return true;
} elseif ( self::$mUserCanApprove === false ) {
return false;
-   } elseif ( $title->userCan( 'approverevisions' ) ) {
+   } elseif ( $title->userCan( $permission )
+  || $wgUser->isAllowed( $permission ) ) {
self::$mUserCanApprove = true;
return true;
} else {
@@ -161,7 +163,6 @@
// revisions - it depends on whether the current
// namespace is within the admin-defined
// $egApprovedRevsSelfOwnedNamespaces array.
-   global $wgUser;
$namespace = $title->getNamespace();
if ( in_array( $namespace, 
$egApprovedRevsSelfOwnedNamespaces ) ) {
if ( $namespace == NS_USER ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I77e3c4bbe0b73b6d3992eaf41dbc6eec2ebbc82f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ApprovedRevs
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger 
Gerrit-Reviewer: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Increase the initial height of the loading box

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: RCFilters: Increase the initial height of the loading box
..


RCFilters: Increase the initial height of the loading box

Bug: T168651
Change-Id: Ia4a079c9d177ad02462a212a60f725ea1943
---
M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
index 844e41c..6277fd9 100644
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
@@ -10,7 +10,7 @@
}
 
.rcfilters-head {
-   min-height: 270px;
+   min-height: 310px;
&:not( .mw-rcfilters-ui-ready ) {
/* @embed */
background-image: url( ../images/pending.gif );

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Add range group filters - limit, days and hours

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: RCFilters: Add range group filters - limit, days and hours
..


RCFilters: Add range group filters - limit, days and hours

- Add 'hidden' groups that have base defaults but are not
  viewed in the filter drop-down.
- Add a UI for days, hours and limit selections, based on their
  group models.
- Clean up the fieldset form to remove redundant line breaks
  and empty objects.
- Add 'hours' as a subset of days, where the UI can split itself
  by picking up values >=1 and <1
- Add the ability to allow 'arbitrary' information from the URL
  values, but also make sure there is a validation method
  and a possibility to re-sort the values that are added in.

Bug: T162784
Bug: T162786
Change-Id: I8068a7cc411eef40ddb8af4eef1d4f1e5f2a2b82
---
M languages/i18n/en.json
M languages/i18n/qqq.json
M resources/Resources.php
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FilterGroup.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js
A resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.DatePopupWidget.less
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
M 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.LiveUpdateButtonWidget.less
A 
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ValuePickerWidget.less
A 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitButtonWidget.js
A 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitPopupWidget.js
A resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DateButtonWidget.js
A resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.DatePopupWidget.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
A resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ValuePickerWidget.js
M tests/qunit/suites/resources/mediawiki.rcfilters/dm.FiltersViewModel.test.js
19 files changed, 740 insertions(+), 30 deletions(-)

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



diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 9447de6..fdfe75a 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1351,6 +1351,12 @@
"recentchanges-submit": "Show",
"rcfilters-activefilters": "Active filters",
"rcfilters-advancedfilters": "Advanced filters",
+   "rcfilters-limit-title": "Changes to show",
+   "rcfilters-limit-shownum": "Show last $1 changes",
+   "rcfilters-days-title": "Recent days",
+   "rcfilters-hours-title": "Recent hours",
+   "rcfilters-days-show-days": "$1 {{PLURAL:$1|day|days}}",
+   "rcfilters-days-show-hours": "$1 {{PLURAL:$1|hour|hours}}",
"rcfilters-quickfilters": "Saved filters",
"rcfilters-quickfilters-placeholder-title": "No links saved yet",
"rcfilters-quickfilters-placeholder-description": "To save your filter 
settings and reuse them later, click the bookmark icon in the Active Filter 
area, below.",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 7c995f0..a5d6d54 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1540,6 +1540,12 @@
"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-limit-title": "Title for the options to change the number of 
results shown.",
+   "rcfilters-days-title": "Title for the options to change the number of 
days for the results shown.",
+   "rcfilters-hours-title": "Title for the options to change the number of 
hours for the results shown.",
+   "rcfilters-limit-shownum": "Title for the button that opens the 
operation to control how many results are shown. \n\nParameters: $1 - Number of 
results shown",
+   "rcfilters-days-show-days": "Title for the button that opens the 
operation to control the day range for the results. \n\nParameters: $1 - Number 
of days shown",
+   "rcfilters-days-show-hours": "Title for the button that opens the 
operation to control the hour range for the results. \n\nParameters: $1 - 
Number of hours shown",
"rcfilters-advancedfilters": "Title for the buttons allowing the user 
to switch to the various advanced filters views.",
"rcfilters-quickfilters": "Label for the button that opens the saved 
filter settings menu in [[Special:RecentChanges]]",
"rcfilters-quickfilters-placeholder-title": "Title for the text

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Augment event logging when switching layers

2017-07-18 Thread Bearloga (Code Review)

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

Change subject: Augment event logging when switching layers
..

Augment event logging when switching layers

Bug: T171020
Depends-On: Id196bdc43aed666573722a73ece41301db364cfd
Change-Id: Icb49ac17a0fc9492779138f546501729558c6582
---
M modules/ext.wikimediaEvents.kartographer.js
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents 
refs/changes/84/366184/1

diff --git a/modules/ext.wikimediaEvents.kartographer.js 
b/modules/ext.wikimediaEvents.kartographer.js
index a28063b..9996062 100644
--- a/modules/ext.wikimediaEvents.kartographer.js
+++ b/modules/ext.wikimediaEvents.kartographer.js
@@ -225,6 +225,10 @@
break;
}
 
+   if ( data.action.endsWith( 'layer' ) ) {
+   options.extra.layer = data.options.extra.layer;
+   }
+
logEvent( data.feature.featureType, data.action, 
data.isFullScreen, isFirstInteraction( isInteraction ), options );
} );
} );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb49ac17a0fc9492779138f546501729558c6582
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: Bearloga 

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

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Augment event logging for switching layers

2017-07-18 Thread Bearloga (Code Review)

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

Change subject: Augment event logging for switching layers
..

Augment event logging for switching layers

Bug: T171020
Change-Id: Id196bdc43aed666573722a73ece41301db364cfd
---
M modules/wikivoyage/WVMapLayers.js
1 file changed, 12 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer 
refs/changes/83/366183/1

diff --git a/modules/wikivoyage/WVMapLayers.js 
b/modules/wikivoyage/WVMapLayers.js
index 114e577..2a7c4d2 100644
--- a/modules/wikivoyage/WVMapLayers.js
+++ b/modules/wikivoyage/WVMapLayers.js
@@ -24,7 +24,12 @@
mw.track( 'mediawiki.kartographer', {
action: ( event.layer === map.wikimediaLayer ) 
? 'wv-select-wmflayer' : 'wv-select-exlayer',
isFullScreen: !!map.options.fullscreen,
-   feature: map
+   feature: map,
+   options: {
+   extra: {
+   layer: event.layer // assumes 
event.layer holds the (string) name of the layer, maybe need to use 
event.layer.name?
+   }
+   }
} );
} );
 
@@ -47,7 +52,12 @@
mw.track( 'mediawiki.kartographer', {
action: eventName,
isFullScreen: !!map.options.fullscreen,
-   feature: map
+   feature: map,
+   options: {
+   extra: {
+   layer: event.layer // assumes 
event.layer holds the (string) name of the layer, maybe need to use 
event.layer.name?
+   }
+   }
} );
} );
};

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id196bdc43aed666573722a73ece41301db364cfd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: Bearloga 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "rancid: switch active server to netmon2001"

2017-07-18 Thread Dzahn (Code Review)

Hello jenkins-bot,

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

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

to review the following change.


Change subject: Revert "rancid: switch active server to netmon2001"
..

Revert "rancid: switch active server to netmon2001"

This reverts commit 08542d1249f4d31fce32c1504c42e094422a3407.

Change-Id: I32a4fc768630a399cd0824f25e95ed9c47713a8d
---
M hieradata/common.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/82/366182/1

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 93a9497..8b92f37 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -462,7 +462,7 @@
 install_server: install1002.wikimedia.org
 install_server_failover: install2002.wikimedia.org
 
-netmon_server: netmon2001.wikimedia.org
+netmon_server: netmon1002.wikimedia.org
 
 # Etcd client global configuration
 etcd_client_srv_domain: "conftool.%{::site}.wmnet"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I32a4fc768630a399cd0824f25e95ed9c47713a8d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 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]: scap/dsh: replace netmon1001->netmont1002 for librenms

2017-07-18 Thread Dzahn (Code Review)

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

Change subject: scap/dsh: replace netmon1001->netmont1002 for librenms
..


scap/dsh: replace netmon1001->netmont1002 for librenms

Bug: T17018
Bug: T159756
Change-Id: I5e8545273daf026b39acaf62f0ff4ec8f6af53e7
---
M hieradata/common/scap/dsh.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/hieradata/common/scap/dsh.yaml b/hieradata/common/scap/dsh.yaml
index 0437667..ea59411 100644
--- a/hieradata/common/scap/dsh.yaml
+++ b/hieradata/common/scap/dsh.yaml
@@ -80,7 +80,7 @@
   - xenon.eqiad.wmnet
   librenms:
 hosts:
-  - netmon1001.wikimedia.org
+  - netmon1002.wikimedia.org
   logstash:
 hosts:
   - logstash1001.eqiad.wmnet

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5e8545273daf026b39acaf62f0ff4ec8f6af53e7
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] operations/puppet[production]: scap/dsh: replace netmon1001->netmont1002 for librenms

2017-07-18 Thread Dzahn (Code Review)

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

Change subject: scap/dsh: replace netmon1001->netmont1002 for librenms
..

scap/dsh: replace netmon1001->netmont1002 for librenms

Bug: T17018
Bug: T159756
Change-Id: I5e8545273daf026b39acaf62f0ff4ec8f6af53e7
---
M hieradata/common/scap/dsh.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/81/366181/1

diff --git a/hieradata/common/scap/dsh.yaml b/hieradata/common/scap/dsh.yaml
index 0437667..ea59411 100644
--- a/hieradata/common/scap/dsh.yaml
+++ b/hieradata/common/scap/dsh.yaml
@@ -80,7 +80,7 @@
   - xenon.eqiad.wmnet
   librenms:
 hosts:
-  - netmon1001.wikimedia.org
+  - netmon1002.wikimedia.org
   logstash:
 hosts:
   - logstash1001.eqiad.wmnet

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5e8545273daf026b39acaf62f0ff4ec8f6af53e7
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]: prometheus: netmon1001 -> netmon1002 for snmp exporter

2017-07-18 Thread Dzahn (Code Review)

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

Change subject: prometheus: netmon1001 -> netmon1002 for snmp exporter
..


prometheus: netmon1001 -> netmon1002 for snmp exporter

Bug: T171018
Change-Id: I486b621790823a613dc12c59906bdc0fa6ff4e76
---
M modules/role/manifests/prometheus/ops.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/role/manifests/prometheus/ops.pp 
b/modules/role/manifests/prometheus/ops.pp
index fbc3be3..301af76 100644
--- a/modules/role/manifests/prometheus/ops.pp
+++ b/modules/role/manifests/prometheus/ops.pp
@@ -298,7 +298,7 @@
 'target_label'  => 'instance',
   },
   { 'target_label' => '__address__',
-'replacement'  => 'netmon1001.wikimedia.org:9116',
+'replacement'  => 'netmon1002.wikimedia.org:9116',
   },
 ],
   },

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I486b621790823a613dc12c59906bdc0fa6ff4e76
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Filippo Giunchedi 
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]: prometheus: netmon1001 -> netmon1002 for snmp exporter

2017-07-18 Thread Dzahn (Code Review)

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

Change subject: prometheus: netmon1001 -> netmon1002 for snmp exporter
..

prometheus: netmon1001 -> netmon1002 for snmp exporter

Bug: T171018
Change-Id: I486b621790823a613dc12c59906bdc0fa6ff4e76
---
M modules/role/manifests/prometheus/ops.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/80/366180/1

diff --git a/modules/role/manifests/prometheus/ops.pp 
b/modules/role/manifests/prometheus/ops.pp
index fbc3be3..301af76 100644
--- a/modules/role/manifests/prometheus/ops.pp
+++ b/modules/role/manifests/prometheus/ops.pp
@@ -298,7 +298,7 @@
 'target_label'  => 'instance',
   },
   { 'target_label' => '__address__',
-'replacement'  => 'netmon1001.wikimedia.org:9116',
+'replacement'  => 'netmon1002.wikimedia.org:9116',
   },
 ],
   },

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I486b621790823a613dc12c59906bdc0fa6ff4e76
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]: netmon1001/site: fix name of 'spare' role class

2017-07-18 Thread Dzahn (Code Review)

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

Change subject: netmon1001/site: fix name of 'spare' role class
..


netmon1001/site: fix name of 'spare' role class

Change-Id: I1b7ded4c7cc5f418704ad025ec23544bc940f8d0
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index c63ac89..eff293a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1783,7 +1783,7 @@
 
 # to be decom'ed (T171018)
 node 'netmon1001.wikimedia.org' {
-role(spare)
+role(spare::system)
 interface::add_ip6_mapped { 'main': }
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1b7ded4c7cc5f418704ad025ec23544bc940f8d0
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] operations/puppet[production]: netmon1001/site: fix name of 'spare' role class

2017-07-18 Thread Dzahn (Code Review)

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

Change subject: netmon1001/site: fix name of 'spare' role class
..

netmon1001/site: fix name of 'spare' role class

Change-Id: I1b7ded4c7cc5f418704ad025ec23544bc940f8d0
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/79/366179/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 01c1aba..9023994 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1783,7 +1783,7 @@
 
 # to be decom'ed (T171018)
 node 'netmon1001.wikimedia.org' {
-role(spare)
+role(spare::system)
 interface::add_ip6_mapped { 'main': }
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b7ded4c7cc5f418704ad025ec23544bc940f8d0
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]: netmon: remove librenms from netmon1001

2017-07-18 Thread Dzahn (Code Review)

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

Change subject: netmon: remove librenms from netmon1001
..


netmon: remove librenms from netmon1001

Remove librenms role from netmon1001, turn
it into a role::spare instead, prepare for decom.

Librenms has moved to netmon1002.

Bug: T159756
Bug: T171018
Change-Id: I2ec22be9b1eb3ae712d5b2491b237bc1049f3350
---
M manifests/site.pp
1 file changed, 3 insertions(+), 7 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index a285527..c63ac89 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1781,25 +1781,21 @@
 interface::add_ip6_mapped { 'main': }
 }
 
-# network monitoring tool server
+# to be decom'ed (T171018)
 node 'netmon1001.wikimedia.org' {
-role(network::monitor, librenms)
-
+role(spare)
 interface::add_ip6_mapped { 'main': }
 }
 
-# network monitoring tool server - replacement servers (T125020, T166180)
+# network monitoring tools, stretch (T125020, T166180)
 node /^netmon(1002|2001)\.wikimedia\.org$/ {
-# TODO: role(librenms)
 role(network::monitor, librenms, rancid, smokeping)
-
 interface::add_ip6_mapped { 'main': }
 }
 
 # jessie VM for servermon until it supports stretch (T170653)
 node 'netmon1003.wikimedia.org' {
 role(network::monitor, servermon::wmf)
-
 interface::add_ip6_mapped { 'main': }
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2ec22be9b1eb3ae712d5b2491b237bc1049f3350
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] operations/puppet[production]: netmon: remove librenms from netmon1001

2017-07-18 Thread Dzahn (Code Review)

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

Change subject: netmon: remove librenms from netmon1001
..

netmon: remove librenms from netmon1001

Remove librenms role from netmon1001, turn
it into a role::spare instead, prepare for decom.

Librenms has moved to netmon1002.

Bug: T159756
Bug: T171018
Change-Id: I2ec22be9b1eb3ae712d5b2491b237bc1049f3350
---
M manifests/site.pp
1 file changed, 3 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/78/366178/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 4b94a85..01c1aba 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1781,25 +1781,21 @@
 interface::add_ip6_mapped { 'main': }
 }
 
-# network monitoring tool server
+# to be decom'ed (T171018)
 node 'netmon1001.wikimedia.org' {
-role(network::monitor, librenms)
-
+role(spare)
 interface::add_ip6_mapped { 'main': }
 }
 
-# network monitoring tool server - replacement servers (T125020, T166180)
+# network monitoring tools, stretch (T125020, T166180)
 node /^netmon(1002|2001)\.wikimedia\.org$/ {
-# TODO: role(librenms)
 role(network::monitor, librenms, rancid, smokeping)
-
 interface::add_ip6_mapped { 'main': }
 }
 
 # jessie VM for servermon until it supports stretch (T170653)
 node 'netmon1003.wikimedia.org' {
 role(network::monitor, servermon::wmf)
-
 interface::add_ip6_mapped { 'main': }
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ec22be9b1eb3ae712d5b2491b237bc1049f3350
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/dns[master]: decom of rcs100[12] production dns

2017-07-18 Thread RobH (Code Review)

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

Change subject: decom of rcs100[12] production dns
..


decom of rcs100[12] production dns

removal of production dns entries as systems are decom

Bug: T170157
Change-Id: I03c04a4cc6a9cffcd50ad7e5956117c5623479db
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 2 insertions(+), 6 deletions(-)

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



diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 301da8a..87370b2 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -251,7 +251,7 @@
 14  1H IN PTR   wdqs1003.eqiad.wmnet.
 15  1H IN PTR   db1011.eqiad.wmnet.
 16  1H IN PTR   scb1001.eqiad.wmnet.
-17  1H IN PTR   rcs1002.eqiad.wmnet.
+
 18  1H IN PTR   conf1001.eqiad.wmnet.
 19  1H IN PTR   db1015.eqiad.wmnet.
 20  1H IN PTR   db1016.eqiad.wmnet.
@@ -814,7 +814,7 @@
 138 1H IN PTR   aqs1005.eqiad.wmnet.
 146 1H IN PTR   osmium.eqiad.wmnet.
 147 1H IN PTR   hp1001.eqiad.wmnet.
-148 1H IN PTR   rcs1001.eqiad.wmnet.
+
 149 1H IN PTR   snapshot1006.eqiad.wmnet.
 150 1H IN PTR   iridium.eqiad.wmnet.
 151 1H IN PTR   ocg1001.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 6358a0d..3a6b682 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -755,10 +755,6 @@
 puppetmaster1001 1H IN  2620:0:861:102:10:64:16:73
 puppetmaster1002 1H IN A10.64.48.45
 puppetmaster1002 1H IN  2620:0:861:107:10:64:48:45
-rcs1001 1H  IN A10.64.32.148
-rcs1001 1H  IN  2620:0:861:103:10:64:32:148
-rcs1002 1H  IN A10.64.0.17
-rcs1002 1H  IN  2620:0:861:101:10:64:0:17
 rdb1001 1H  IN A10.64.32.76
 rdb1002 1H  IN A10.64.32.77
 rdb1003 1H  IN A10.64.0.201

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I03c04a4cc6a9cffcd50ad7e5956117c5623479db
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: RobH 
Gerrit-Reviewer: RobH 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: decom of rcs100[12] production dns

2017-07-18 Thread RobH (Code Review)

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

Change subject: decom of rcs100[12] production dns
..

decom of rcs100[12] production dns

removal of production dns entries as systems are decom

Bug: T170157
Change-Id: I03c04a4cc6a9cffcd50ad7e5956117c5623479db
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 2 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/77/366177/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 301da8a..87370b2 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -251,7 +251,7 @@
 14  1H IN PTR   wdqs1003.eqiad.wmnet.
 15  1H IN PTR   db1011.eqiad.wmnet.
 16  1H IN PTR   scb1001.eqiad.wmnet.
-17  1H IN PTR   rcs1002.eqiad.wmnet.
+
 18  1H IN PTR   conf1001.eqiad.wmnet.
 19  1H IN PTR   db1015.eqiad.wmnet.
 20  1H IN PTR   db1016.eqiad.wmnet.
@@ -814,7 +814,7 @@
 138 1H IN PTR   aqs1005.eqiad.wmnet.
 146 1H IN PTR   osmium.eqiad.wmnet.
 147 1H IN PTR   hp1001.eqiad.wmnet.
-148 1H IN PTR   rcs1001.eqiad.wmnet.
+
 149 1H IN PTR   snapshot1006.eqiad.wmnet.
 150 1H IN PTR   iridium.eqiad.wmnet.
 151 1H IN PTR   ocg1001.eqiad.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 6358a0d..3a6b682 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -755,10 +755,6 @@
 puppetmaster1001 1H IN  2620:0:861:102:10:64:16:73
 puppetmaster1002 1H IN A10.64.48.45
 puppetmaster1002 1H IN  2620:0:861:107:10:64:48:45
-rcs1001 1H  IN A10.64.32.148
-rcs1001 1H  IN  2620:0:861:103:10:64:32:148
-rcs1002 1H  IN A10.64.0.17
-rcs1002 1H  IN  2620:0:861:101:10:64:0:17
 rdb1001 1H  IN A10.64.32.76
 rdb1002 1H  IN A10.64.32.77
 rdb1003 1H  IN A10.64.0.201

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I03c04a4cc6a9cffcd50ad7e5956117c5623479db
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: RobH 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: decom rcs100[12]

2017-07-18 Thread RobH (Code Review)

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

Change subject: decom rcs100[12]
..

decom rcs100[12]

removing references to these two sysetms in operations/puppet

Bug: T170157
Change-Id: Ia6ba295b2b0d1adf639d1bd1084efeb86cdf643b
---
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
2 files changed, 1 insertion(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/76/366176/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 4b94a85..a285527 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1943,13 +1943,6 @@
 interface::add_ip6_mapped { 'main': }
 }
 
-# Live Recent Changes WebSocket stream # Decommed: T156919
-node 'rcs1001.eqiad.wmnet', 'rcs1002.eqiad.wmnet' {
-interface::add_ip6_mapped { 'main': }
-role(spare::system)
-}
-
-
 node /^rdb100[1357]\.eqiad\.wmnet$/ {
 role(jobqueue_redis::master)
 }
diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 80bd1b7..dd299f5 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -132,7 +132,7 @@
 mw13*) echo partman/mw-raid1.cfg ;; \
 mw22*) echo partman/mw-raid1.cfg ;; \
 osmium) echo partman/mw-raid1.cfg ;; \
-mw[0-9]*|rcs[0-9]*) echo partman/mw.cfg ;; \
+mw[0-9]*) echo partman/mw.cfg ;; \
 mx1001|mx2001) echo partman/flat.cfg virtual.cfg ;; \
 netmon1001) echo partman/lvm-ext-srv.cfg ;; \
 labservices1001|labservices1002|radium|silver|uranium) echo 
partman/raid1.cfg ;; \

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: decom rcs100[12]

2017-07-18 Thread RobH (Code Review)

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

Change subject: decom rcs100[12]
..


decom rcs100[12]

removing references to these two sysetms in operations/puppet

Bug: T170157
Change-Id: Ia6ba295b2b0d1adf639d1bd1084efeb86cdf643b
---
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
2 files changed, 1 insertion(+), 8 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 4b94a85..a285527 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1943,13 +1943,6 @@
 interface::add_ip6_mapped { 'main': }
 }
 
-# Live Recent Changes WebSocket stream # Decommed: T156919
-node 'rcs1001.eqiad.wmnet', 'rcs1002.eqiad.wmnet' {
-interface::add_ip6_mapped { 'main': }
-role(spare::system)
-}
-
-
 node /^rdb100[1357]\.eqiad\.wmnet$/ {
 role(jobqueue_redis::master)
 }
diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 80bd1b7..dd299f5 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -132,7 +132,7 @@
 mw13*) echo partman/mw-raid1.cfg ;; \
 mw22*) echo partman/mw-raid1.cfg ;; \
 osmium) echo partman/mw-raid1.cfg ;; \
-mw[0-9]*|rcs[0-9]*) echo partman/mw.cfg ;; \
+mw[0-9]*) echo partman/mw.cfg ;; \
 mx1001|mx2001) echo partman/flat.cfg virtual.cfg ;; \
 netmon1001) echo partman/lvm-ext-srv.cfg ;; \
 labservices1001|labservices1002|radium|silver|uranium) echo 
partman/raid1.cfg ;; \

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove rcs100[12] from $wgRCFeeds

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: Remove rcs100[12] from $wgRCFeeds
..


Remove rcs100[12] from $wgRCFeeds

Stops a load of logspam

Bug: T170157
Change-Id: I4cb27b635290e06ec0526891c380bd34c46ee7ea
---
M wmf-config/CommonSettings.php
1 file changed, 0 insertions(+), 13 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 5d4c6db..b6ffad9 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3481,19 +3481,6 @@
'add_interwiki_prefix' => false,
'omit_bots' => false,
];
-
-   // RCStream / stream.wikimedia.org
-   if ( $wmfRealm === 'production' ) {
-   $wgRCFeeds['rcs1001'] = [
-   'uri'   => 
"redis://rcs1001.eqiad.wmnet:6379/rc.$wgDBname",
-   'formatter' => 'JSONRCFeedFormatter',
-   ];
-
-   $wgRCFeeds['rcs1002'] = [
-   'uri'   => 
"redis://rcs1002.eqiad.wmnet:6379/rc.$wgDBname",
-   'formatter' => 'JSONRCFeedFormatter',
-   ];
-   }
 }
 
 // Confirmed can do anything autoconfirmed can.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4cb27b635290e06ec0526891c380bd34c46ee7ea
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Florianschmidtwelzow 
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]: Remove rcs100[12] from $wgRCFeeds

2017-07-18 Thread Reedy (Code Review)

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

Change subject: Remove rcs100[12] from $wgRCFeeds
..

Remove rcs100[12] from $wgRCFeeds

Stops a load of logspam

Bug: T170157
Change-Id: I4cb27b635290e06ec0526891c380bd34c46ee7ea
---
M wmf-config/CommonSettings.php
1 file changed, 0 insertions(+), 13 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 5d4c6db..b6ffad9 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -3481,19 +3481,6 @@
'add_interwiki_prefix' => false,
'omit_bots' => false,
];
-
-   // RCStream / stream.wikimedia.org
-   if ( $wmfRealm === 'production' ) {
-   $wgRCFeeds['rcs1001'] = [
-   'uri'   => 
"redis://rcs1001.eqiad.wmnet:6379/rc.$wgDBname",
-   'formatter' => 'JSONRCFeedFormatter',
-   ];
-
-   $wgRCFeeds['rcs1002'] = [
-   'uri'   => 
"redis://rcs1002.eqiad.wmnet:6379/rc.$wgDBname",
-   'formatter' => 'JSONRCFeedFormatter',
-   ];
-   }
 }
 
 // Confirmed can do anything autoconfirmed can.

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: [WIP] phpcs.xml: Move after .

2017-07-18 Thread Fomafix (Code Review)

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

Change subject: [WIP] phpcs.xml: Move  after .
..

[WIP] phpcs.xml: Move  after .

*
This patch set touches a file in languages/messages/Messages*.php to
test phpcs in gerrit.
*

The  do not work before ..

This change partly reverts b5cddfb27b.

Bug: T170159
Change-Id: Ic77fed3ff7c3e5ee21236be04afca3868c20354e
---
M languages/messages/MessagesSh.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/74/366174/1

diff --git a/languages/messages/MessagesSh.php 
b/languages/messages/MessagesSh.php
index 8130978..185685a 100644
--- a/languages/messages/MessagesSh.php
+++ b/languages/messages/MessagesSh.php
@@ -1,6 +1,7 @@
 https://translatewiki.net
  *
  * @ingroup Language

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

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

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

[MediaWiki-commits] [Gerrit] operations/dns[master]: switch librenms from netmon1001 to netmon1002

2017-07-18 Thread Dzahn (Code Review)

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

Change subject: switch librenms from netmon1001 to netmon1002
..


switch librenms from netmon1001 to netmon1002

This is now ready to switch over. The role works, i see the dashboards
with data.

Bug: T159756
Change-Id: I39cd83bd7188c68c7fbf5a1fedd884ccda603be1
---
M templates/wikimedia.org
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index 21b67d7..2787107 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -533,7 +533,7 @@
 
 login   600 IN DYNA geoip!text-addrs
 
-librenms1H  IN CNAMEnetmon1001
+librenms1H  IN CNAMEnetmon1002
 servermon   600 IN DYNA geoip!misc-addrs
 
 payments5M  IN A208.80.155.5   ; eqiad

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I39cd83bd7188c68c7fbf5a1fedd884ccda603be1
Gerrit-PatchSet: 3
Gerrit-Project: operations/dns
Gerrit-Branch: master
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...Vector[master]: Feature flagged print styles

2017-07-18 Thread Jdlrobson (Code Review)

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

Change subject: Feature flagged print styles
..

Feature flagged print styles

These are feature flagged to allow editors to test before making
them the default. A class is added to the body tag to allow us
to switch between old and new styles at a later date.

To start with we introduce some typography improvements.
Further iterations will focus on other elements.

Bug: T169823
Change-Id: I453ae43099796a74c39d965b796f2fa13942106c
---
M SkinVector.php
A print.less
M skin.json
3 files changed, 116 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector 
refs/changes/73/366173/1

diff --git a/SkinVector.php b/SkinVector.php
index 1733bb6..07dd060 100644
--- a/SkinVector.php
+++ b/SkinVector.php
@@ -40,6 +40,15 @@
$this->vectorConfig = 
ConfigFactory::getDefaultInstance()->makeConfig( 'vector' );
}
 
+   /** @inheritdoc */
+   public function getPageClasses( $title ) {
+   $className = parent::getPageClasses( $title );
+   if ( $this->vectorConfig->get( 'VectorExperimentalPrintStyles' 
) ) {
+   $className .= ' vector-print-styles';
+   }
+   return $className;
+   }
+
/**
 * Enables the responsive mode
 */
@@ -63,6 +72,12 @@
$this->enableResponsiveMode();
}
 
+   // Print styles are feature flagged.
+   // This flag can be removed when T154965 is resolved.
+   if ( $this->vectorConfig->get( 'VectorExperimentalPrintStyles' 
) ) {
+   $out->addModuleStyles( 'skins.vector.print.styles' );
+   }
+
$out->addModules( 'skins.vector.js' );
}
 
diff --git a/print.less b/print.less
new file mode 100644
index 000..b0160d4
--- /dev/null
+++ b/print.less
@@ -0,0 +1,92 @@
+@pureBlack: #000;
+
+@media print {
+   body.vector-print-styles {
+   padding: 10px;
+   font-family: serif;
+   }
+
+   .vector-print-styles {
+
+   // Normalize Blue links in the article
+   a {
+   border-bottom:1px solid #aaa;
+   }
+
+
+   .firstHeading {
+   font-size: 25pt;
+   line-height: 28pt;
+   margin-bottom: 20px;
+   padding-bottom: 5px;
+   }
+
+   // Headings
+   .firstHeading,
+   > h2 {
+   border-bottom: 2px solid @pureBlack;
+   }
+
+   h3,
+   h4,
+   h5,
+   h6 {
+   margin: 30px 0 0;
+   font-family: sans-serif;
+   }
+
+   h2,
+   h3,
+   h4,
+   h5,
+   h6 {
+   page-break-before: avoid;
+   display: block;
+   padding: 0;
+   position: relative;
+   }
+
+   h2 {
+   font-size: 18pt;
+   line-height: 24pt;
+   margin-bottom: 0.25em;
+   overflow: hidden;
+   }
+
+   h3 {
+   font-size: 13pt;
+   line-height: 20pt;
+   }
+
+   h4,
+   h5,
+   h6 {
+   font-size: 10pt;
+   line-height: 15pt;
+   }
+
+   p {
+   font-size: 10pt;
+   line-height: 16pt;
+   margin-top: 5px;
+   text-align: justify;
+   }
+
+   blockquote {
+   border-left: 2px solid @pureBlack;
+   padding-left: 20px;
+   }
+
+   ul {
+   list-style-type: square;
+   margin: .3em 0 0 1.6em;
+   padding: 0;
+   margin-top: 10px;
+
+   li {
+   padding: 5px 0;
+   font-size: 10pt;
+   }
+   }
+   }
+}
diff --git a/skin.json b/skin.json
index 3f016a7..b96f87c 100644
--- a/skin.json
+++ b/skin.json
@@ -48,6 +48,13 @@
}
}
},
+   "skins.vector.print.styles": {
+   "targets": [ "desktop", "mobile" ],
+   "position": "top",
+   "styles": [
+   "print.less"
+   ]
+   },

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add din to InterwikiSortOrders

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: Add din to InterwikiSortOrders
..


Add din to InterwikiSortOrders

Bug: T168518
Change-Id: I8944349967ce53f260c87871d18d2da86469c610
---
M wmf-config/InterwikiSortOrders.php
1 file changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/wmf-config/InterwikiSortOrders.php 
b/wmf-config/InterwikiSortOrders.php
index 12d5097..e5df248 100644
--- a/wmf-config/InterwikiSortOrders.php
+++ b/wmf-config/InterwikiSortOrders.php
@@ -24,7 +24,7 @@
'se', 'sm', 'sa', 'sg', 'sc', 'sco', 'stq', 'st', 'nso', 'tn', 
'sq', 'scn',
'si', 'simple', 'sd', 'ss', 'sk', 'sl', 'cu', 'szl', 'so', 
'ckb', 'srn', 'sr',
'sh', 'su', 'fi', 'sv', 'tl', 'ta', 'shi', 'kab', 'roa-tara', 
'tt', 'te', 'tet',
-   'th', 'ti', 'tg', 'to', 'chr', 'chy', 've', 'tcy', 'tr', 'tk', 
'tw', 'tyv', 'udm', 'bug',
+   'th', 'ti', 'tg', 'to', 'chr', 'chy', 've', 'tcy', 'tr', 'tk', 
'tw', 'tyv', 'din', 'udm', 'bug',
'uk', 'ur', 'ug', 'za', 'vec', 'vep', 'vi', 'vo', 'fiu-vro', 
'wa', 'zh-classical',
'vls', 'war', 'wo', 'wuu', 'ts', 'yi', 'yo', 'zh-yue', 'diq', 
'zea', 'bat-smg',
'zh', 'zh-tw', 'zh-cn'
@@ -50,7 +50,7 @@
'pt', 'aa', 'kaa', 'crh', 'ty', 'ksh', 'ro', 'rmy', 'rm', 'qu', 
'ru', 'rue', 'sah',
'se', 'sa', 'sg', 'sc', 'sco', 'stq', 'st', 'nso', 'tn', 'sq', 
'scn', 'si',
'simple', 'sd', 'ss', 'sk', 'sl', 'cu', 'szl', 'so', 'ckb', 
'srn', 'sr', 'sh',
-   'fi', 'sv', 'tl', 'ta', 'shi', 'kab', 'roa-tara', 'tt', 'te', 
'tet', 'th', 'vi',
+   'fi', 'sv', 'tl', 'ta', 'shi', 'kab', 'roa-tara', 'tt', 'te', 
'tet', 'din', 'th', 'vi',
'ti', 'tg', 'tpi', 'tokipona', 'tp', 'chr', 'chy', 've', 'tcy', 
'tr', 'tk', 'tw',
'tyv', 'udm', 'uk', 'ur', 'ug', 'za', 'vec', 'vep', 'vo', 
'fiu-vro', 'wa',
'zh-classical', 'vls', 'war', 'wo', 'wuu', 'ts', 'yi', 'yo', 
'zh-yue', 'diq',
@@ -79,7 +79,7 @@
'rm', 'qu', 'ru', 'rue', 'sa', 'sah', 'se', 'sg', 'sc', 'sco', 
'sd', 'stq',
'st', 'nso', 'tn', 'sq', 'si', 'scn', 'simple', 'ss', 'sk', 
'sl', 'cu', 'szl',
'so', 'ckb', 'srn', 'sr', 'sh', 'fi', 'sv', 'ta', 'shi', 'tl', 
'kab',
-   'roa-tara', 'tt', 'te', 'tet', 'th', 'ti', 'vi', 'tg', 
'tokipona', 'tp',
+   'roa-tara', 'tt', 'te', 'tet', 'din', 'th', 'ti', 'vi', 'tg', 
'tokipona', 'tp',
'tpi', 'chy', 've', 'tcy', 'tr', 'tk', 'tw', 'tyv', 'udm', 
'uk', 'ur', 'ug', 'za', 'vec',
'vep', 'vo', 'fiu-vro', 'wa', 'vls', 'war', 'wo', 'wuu', 'ts', 
'xmf', 'yi',
'yo', 'diq', 'zea', 'zh', 'zh-tw', 'zh-cn', 'zh-classical', 
'zh-yue', 'bat-smg'
@@ -89,7 +89,7 @@
'arz', 'as', 'ast', 'atj', 'av', 'az', 'azb', 'ba', 'bar', 
'bat-smg', 'bcl', 'be',
'be-x-old', 'bg', 'bh', 'bi', 'bjn', 'bm', 'bn', 'bo', 'bpy', 
'br', 'bs', 'bug', 'bxr',
'ca', 'cbk-zam', 'cdo', 'ce', 'ceb', 'ch', 'chy', 'cho', 'chr', 
'cy', 'ckb',
-   'co', 'cr', 'crh', 'cs', 'csb', 'cu', 'cv', 'da', 'de', 'diq', 
'dk', 'dsb', 'dv',
+   'co', 'cr', 'crh', 'cs', 'csb', 'cu', 'cv', 'da', 'de', 'din', 
'diq', 'dk', 'dsb', 'dv',
'dz', 'ee', 'el', 'eml', 'en', 'eo', 'es', 'et', 'eu', 'ext', 
'fa', 'ff', 'fi',
'fy', 'fiu-vro', 'fj', 'fo', 'fr', 'frp', 'frr', 'fur', 'ga', 
'gag', 'gan', 'gd',
'gl', 'glk', 'gn', 'got', 'gom', 'gu', 'gv', 'ha', 'hak', 
'haw', 'he', 'hi', 'hy',
@@ -122,7 +122,7 @@
'my', 'fj', 'nah', 'nl', 'cr', 'no', 'nn', 'hsb', 'oc', 'om', 
'ug',
'uz', 'nds', 'pl', 'pt', 'ro', 'rm', 'qu', 'sg', 'sc', 'st', 
'tn',
'sq', 'scn', 'simple', 'ss', 'sk', 'sl', 'so', 'sh', 'fi', 'sv',
-   'tl', 'tt', 'vi', 'tpi', 'tr', 'tw', 'vo', 'wa', 'wo', 'ts', 
'yo',
+   'tl', 'tt', 'vi', 'tpi', 'tr', 'tw', 'din', 'vo', 'wa', 'wo', 
'ts', 'yo',
'el', 'av', 'ab', 'ba', 'be', 'bg', 'mk', 'mn', 'ru', 'sr', 
'tg',
'uk', 'kk', 'hy', 'yi', 'he', 'ur', 'ar', 'tk', 'sd', 'fa', 
'ha',
'ps', 'dv', 'ks', 'ne', 'pi', 'bh', 'mr', 'sa', 'hi', 'as', 
'bn',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8944349967ce53f260c87871d18d2da86469c610
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Amire80 
Gerrit-Reviewer: Florianschmidtwelzow

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add Welsh mobile logo (just changes 'k' to 'c').

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: Add Welsh mobile logo (just changes 'k' to 'c').
..


Add Welsh mobile logo (just changes 'k' to 'c').

Change-Id: Ib46dc826340802dca0c5efa38759d73ab1b12282
---
A static/images/mobile/copyright/wikipedia-wordmark-cy.svg
M wmf-config/InitialiseSettings.php
2 files changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Urbanecm: Looks good to me, but someone else must approve
  Thcipriani: Looks good to me, approved
  jenkins-bot: Verified
  Nirzar: Looks good to me, but someone else must approve
  Jforrester: Looks good to me, but someone else must approve



diff --git a/static/images/mobile/copyright/wikipedia-wordmark-cy.svg 
b/static/images/mobile/copyright/wikipedia-wordmark-cy.svg
new file mode 100644
index 000..598f508
--- /dev/null
+++ b/static/images/mobile/copyright/wikipedia-wordmark-cy.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg; viewBox="0 0 116 18">
\ No newline at end of file
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index d856156..e088876 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15342,6 +15342,11 @@
'copyright-width' => 92,
'copyright-height' => 21,
],
+   'cywiki' => [
+   'copyright' => 
'/static/images/mobile/copyright/wikipedia-wordmark-cy.svg',
+   'copyright-width' => 116,
+   'copyright-height' => 18,
+   ],
'frwiki' => [
'copyright' => 
'/static/images/mobile/copyright/wikipedia-wordmark-fr.svg',
'copyright-width' => 116,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib46dc826340802dca0c5efa38759d73ab1b12282
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Nirzar 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Fix http://php5.local.wmftest.net:8080 to actually be PHP 5 ...

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: Fix http://php5.local.wmftest.net:8080 to actually be PHP 5 
(Zend)
..


Fix http://php5.local.wmftest.net:8080 to actually be PHP 5 (Zend)

This was broken, apparently since
755639030d26936449d4bb4f4333f068d951f809

In the generated config, ServerAlias was blank.

Change-Id: Id3e87ca799961ae26f75880aab69c89b97ffd8e9
---
M puppet/modules/mediawiki/manifests/apache.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/puppet/modules/mediawiki/manifests/apache.pp 
b/puppet/modules/mediawiki/manifests/apache.pp
index 4e4dd1c..6db5a5c 100644
--- a/puppet/modules/mediawiki/manifests/apache.pp
+++ b/puppet/modules/mediawiki/manifests/apache.pp
@@ -12,6 +12,7 @@
 #
 class mediawiki::apache(
 $docroot,
+$php5_site_name,
 ) {
 include ::mediawiki
 include ::mediawiki::multiwiki

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id3e87ca799961ae26f75880aab69c89b97ffd8e9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Sbisson 
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...Thanks[wmf/1.30.0-wmf.9]: Add missing jQueryMsg dependency for mobile diff view

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: Add missing jQueryMsg dependency for mobile diff view
..


Add missing jQueryMsg dependency for mobile diff view

Bug: T170917
Change-Id: Ibca76902e0d748b95bb57e871993a4dc2664d5cd
(cherry picked from commit 545a7de5e2eaadaa7d245e92eabe472b784d6b1b)
---
M extension.json
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/extension.json b/extension.json
index 314b78f..5e30b49 100644
--- a/extension.json
+++ b/extension.json
@@ -102,6 +102,7 @@
],
"dependencies": [
"mediawiki.api",
+   "mediawiki.jqueryMsg",
"mediawiki.notify"
],
"targets": [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibca76902e0d748b95bb57e871993a4dc2664d5cd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Thanks
Gerrit-Branch: wmf/1.30.0-wmf.9
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Thcipriani 
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 OOjs UI EditPage buttons on all Wikipedias

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: Enable OOjs UI EditPage buttons on all Wikipedias
..


Enable OOjs UI EditPage buttons on all Wikipedias

Bug: T162849
Change-Id: Ie926106d84c3aca51bec1a002f3301eb32e13380
---
M wmf-config/InitialiseSettings.php
1 file changed, 1 insertion(+), 7 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index d359acd..d856156 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14796,13 +14796,7 @@
 'wgOOUIEditPage' => [
'default' => false,
'mediawikiwiki' => true,
-   'eswiki' => true,
-   'fawiki' => true,
-   'frwiki' => true,
-   'itwiki' => true,
-   'jawiki' => true,
-   'plwiki' => true,
-   'ruwiki' => true,
+   'wikipedia' => true,
'metawiki' => true,
 ],
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie926106d84c3aca51bec1a002f3301eb32e13380
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Thcipriani 
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: Don't emit wikipage.content on first load

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: RCFilters: Don't emit wikipage.content on first load
..


RCFilters: Don't emit wikipage.content on first load

If the first load uses existing DOM elements, don't emit that
hook. Only emit if we're pulling from the server for new results.

Bug: T165350
Change-Id: Ib17fdd16a908808f99fe8506c50c61d90ad4addc
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ChangesListViewModel.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
4 files changed, 19 insertions(+), 9 deletions(-)

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



diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ChangesListViewModel.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ChangesListViewModel.js
index c839a13..49c0b82 100644
--- 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ChangesListViewModel.js
+++ 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ChangesListViewModel.js
@@ -52,10 +52,11 @@
 *
 * @param {jQuery|string} changesListContent
 * @param {jQuery} $fieldset
+* @param {boolean} [isInitialDOM] Using the initial (already attached) 
DOM elements
 */
-   mw.rcfilters.dm.ChangesListViewModel.prototype.update = function ( 
changesListContent, $fieldset ) {
+   mw.rcfilters.dm.ChangesListViewModel.prototype.update = function ( 
changesListContent, $fieldset, isInitialDOM ) {
this.valid = true;
-   this.emit( 'update', changesListContent, $fieldset );
+   this.emit( 'update', changesListContent, $fieldset, 
isInitialDOM );
};
 
 }( mediaWiki ) );
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 5858566..0abfb34 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -136,7 +136,8 @@
// so it gets processed
this.changesListModel.update(
$changesList.length ? $changesList : 
'NO_RESULTS',
-   $( 'fieldset.rcoptions' ).first()
+   $( 'fieldset.rcoptions' ).first(),
+   true // We're using existing DOM elements
);
}
 
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
index 843acce..6512f04 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
@@ -87,8 +87,10 @@
 * Respond to changes list model update
 *
 * @param {jQuery|string} $changesListContent The content of the 
updated changes list
+* @param {jQuery} $fieldset The content of the updated fieldset
+* @param {boolean} isInitialDOM Whether $changesListContent is the 
existing (already attached) DOM
 */
-   mw.rcfilters.ui.ChangesListWrapperWidget.prototype.onModelUpdate = 
function ( $changesListContent ) {
+   mw.rcfilters.ui.ChangesListWrapperWidget.prototype.onModelUpdate = 
function ( $changesListContent, $fieldset, isInitialDOM ) {
var conflictItem,
$message = $( '' )
.addClass( 
'mw-rcfilters-ui-changesListWrapperWidget-results' ),
@@ -130,8 +132,10 @@
// Apply highlight
this.applyHighlight();
 
-   // Make sure enhanced RC re-initializes correctly
-   mw.hook( 'wikipage.content' ).fire( this.$element );
+   if ( !isInitialDOM ) {
+   // Make sure enhanced RC re-initializes 
correctly
+   mw.hook( 'wikipage.content' ).fire( 
this.$element );
+   }
}
this.popPending();
};
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
index dbee65c..9c82451 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
@@ -99,14 +99,18 @@
 *
 * @param {jQuery|string} $changesList Updated changes list
 * @param {jQuery} $fieldset Updated fieldset
+

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaMessages[master]: Hooks::onBeforePageDisplay: Don't show a Beta Features invit...

2017-07-18 Thread Jforrester (Code Review)

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

Change subject: Hooks::onBeforePageDisplay: Don't show a Beta Features invite 
on non-BF wikis
..

Hooks::onBeforePageDisplay: Don't show a Beta Features invite on non-BF wikis

Bug: T165822
Change-Id: If770a109e24eae741ac8767a00cfd99752a3e95a
---
M WikimediaMessages.hooks.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMessages 
refs/changes/72/366172/1

diff --git a/WikimediaMessages.hooks.php b/WikimediaMessages.hooks.php
index 4733df2..685794f 100644
--- a/WikimediaMessages.hooks.php
+++ b/WikimediaMessages.hooks.php
@@ -1300,6 +1300,7 @@
GuidedTourLauncher::launchTourByCookie( 
'RcFiltersInvite', 'Confirm' );
}
} elseif (
+   class_exists( 'BetaFeatures' ) &&
!$user->getOption( 
'rcenhancedfilters-seen-invite' ) &&
!$user->getOption( 
'rcenhancedfilters-seen-tour' )
) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If770a109e24eae741ac8767a00cfd99752a3e95a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMessages
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/core[master]: RCFilters: Change `What's this?` i18n based on user testing

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: RCFilters: Change `What's this?` i18n based on user testing
..


RCFilters: Change `What's this?` i18n based on user testing

Also minor tweak to the qqq to help translators understand.

Bug: T169053
Change-Id: If5aebae20d2e0037b28090d85cd9b076ac4b3178
---
M languages/i18n/en.json
M languages/i18n/qqq.json
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 64f9b7b..a76eafc 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1371,7 +1371,7 @@
"rcfilters-invalid-filter": "Invalid filter",
"rcfilters-empty-filter": "No active filters. All contributions are 
shown.",
"rcfilters-filterlist-title": "Filters",
-   "rcfilters-filterlist-whatsthis": "What's this?",
+   "rcfilters-filterlist-whatsthis": "How do these work?",
"rcfilters-filterlist-feedbacklink": "Provide feedback on the new 
(beta) filters",
"rcfilters-highlightbutton-title": "Highlight results",
"rcfilters-highlightmenu-title": "Select a color",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index d98f8b0..c8f0e06 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1561,7 +1561,7 @@
"rcfilters-invalid-filter": "A label for an invalid filter.",
"rcfilters-empty-filter": "Placeholder for the filter list when no 
filters were chosen.",
"rcfilters-filterlist-title": "Title for the filters 
list.\n{{Identical|Filter}}",
-   "rcfilters-filterlist-whatsthis": "Caption for the link that opens a 
popup with explanations about this filter group.",
+   "rcfilters-filterlist-whatsthis": "Caption for the link that opens a 
popup with explanations about this filter group, explaining what it is and how 
it works.",
"rcfilters-filterlist-feedbacklink": "Caption for the link to the 
feedback page about the filters beta feature.",
"rcfilters-highlightbutton-title": "Title for the highlight button used 
to toggle the highlight feature on and off.",
"rcfilters-highlightmenu-title": "Title for the highlight menu used to 
select the highlight color for an individual filter.",

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Only open one 'Whats This' popup at a time

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: RCFilters: Only open one 'Whats This' popup at a time
..


RCFilters: Only open one 'Whats This' popup at a time

Remove 'overlay' and this.$element from the $autoCloseIgnore, since
the entire popup is in the overlay anyways.

Bug: T169047
Change-Id: I57300413297d86eca9bcc3d49766f4e41ab628be
---
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuSectionOptionWidget.js
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuSectionOptionWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuSectionOptionWidget.js
index 9f41712..88479c3 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuSectionOptionWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuSectionOptionWidget.js
@@ -72,7 +72,6 @@
classes: [ 
'mw-rcfilters-ui-filterMenuSectionOptionWidget-whatsThisButton' ],
flags: [ 'progressive' ],
popup: {
-   $autoCloseIgnore: this.$element.add( 
this.$overlay ),
padded: false,
align: 'center',
position: 'above',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I57300413297d86eca9bcc3d49766f4e41ab628be
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jack Phoenix 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ApprovedRevs[master]: ApprovedRevs only recognises per-page rights, not group rights

2017-07-18 Thread MarkAHershberger (Code Review)

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

Change subject: ApprovedRevs only recognises per-page rights, not group rights
..

ApprovedRevs only recognises per-page rights, not group rights

When testing to see if a user has the approverevisions right, the only
check is of $title->userCan('approverevisions'). This check, though
has hooks that allow other code to alter the value returned on a
per-page basis.

Instead, $wgUser->isAllowed('approverevisions') should be used since
it is a general check on the approverevisions right.

Change-Id: I77e3c4bbe0b73b6d3992eaf41dbc6eec2ebbc82f
---
M ApprovedRevs_body.php
1 file changed, 7 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ApprovedRevs 
refs/changes/71/366171/1

diff --git a/ApprovedRevs_body.php b/ApprovedRevs_body.php
index f59a955..d279b25 100644
--- a/ApprovedRevs_body.php
+++ b/ApprovedRevs_body.php
@@ -14,7 +14,7 @@
static $mApprovedContentForPage = array();
static $mApprovedRevIDForPage = array();
static $mUserCanApprove = null;
-
+   
/**
 * Gets the approved revision ID for this page, or null if there isn't
 * one.
@@ -49,8 +49,8 @@
 * (otherwise).
 */
public static function getPageText( $title, $revisionID = null ) {
-   $revision = Revision::newFromTitle( $title, $revisionID );
-   return $revision->getContent()->getNativeData();
+   $revision = Revision::newFromTitle( $title, $revisionID 
);
+   return $revision->getContent()->getNativeData();
}
 
/**
@@ -143,7 +143,8 @@
}
 
public static function userCanApprove( $title ) {
-   global $egApprovedRevsSelfOwnedNamespaces;
+   global $egApprovedRevsSelfOwnedNamespaces, $wgUser;
+   $permission = 'approverevisions';
 
// $mUserCanApprove is a static variable used for
// "caching" the result of this function, so that
@@ -152,7 +153,8 @@
return true;
} elseif ( self::$mUserCanApprove === false ) {
return false;
-   } elseif ( $title->userCan( 'approverevisions' ) ) {
+   } elseif ( $title->userCan( $permission )
+  || $wgUser->isAllowed( $permission ) ) {
self::$mUserCanApprove = true;
return true;
} else {
@@ -161,7 +163,6 @@
// revisions - it depends on whether the current
// namespace is within the admin-defined
// $egApprovedRevsSelfOwnedNamespaces array.
-   global $wgUser;
$namespace = $title->getNamespace();
if ( in_array( $namespace, 
$egApprovedRevsSelfOwnedNamespaces ) ) {
if ( $namespace == NS_USER ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I77e3c4bbe0b73b6d3992eaf41dbc6eec2ebbc82f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ApprovedRevs
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger 

___
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 CodeMirror on simplewiki for better testing and more ...

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: Enable CodeMirror on simplewiki for better testing and more 
exposure
..


Enable CodeMirror on simplewiki for better testing and more exposure

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

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 95332d5..d359acd 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19092,6 +19092,7 @@
 
 'wmgUseCodeMirror' => [
'default' => false,
+   'simplewiki' => true,
'testwiki' => true, // T169284
 ],
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4968d343f601fdd732d7686daca76ffed2092165
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Niharika29 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Kaldari 
Gerrit-Reviewer: Thcipriani 
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]: Move R-related code from shiny_server to separate module

2017-07-18 Thread Bearloga (Code Review)

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

Change subject: Move R-related code from shiny_server to separate module
..

Move R-related code from shiny_server to separate module

- Moves the code for installing R and its packages from
  'shiny_server' and puts them into a new module 'r' to
  facilitate working with R in Puppet without having to
  deal with Shiny Server software.
- Also adds the new module to statistics::packages.

Bug: T153856
Change-Id: Ibd8b76f2ffd1cfaab6fdcc84117042eb668ed598
---
M modules/profile/manifests/discovery_dashboards/base.pp
A modules/r/README.md
R modules/r/files/update-library.R
R modules/r/manifests/cran.pp
R modules/r/manifests/git.pp
R modules/r/manifests/github.pp
A modules/r/manifests/init.pp
M modules/role/manifests/discovery/beta_dashboards.pp
M modules/role/manifests/discovery/dashboards.pp
M modules/shiny_server/README.md
M modules/shiny_server/manifests/init.pp
M modules/statistics/manifests/packages.pp
12 files changed, 186 insertions(+), 107 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/70/366170/1

diff --git a/modules/profile/manifests/discovery_dashboards/base.pp 
b/modules/profile/manifests/discovery_dashboards/base.pp
index f148c59..e222477 100644
--- a/modules/profile/manifests/discovery_dashboards/base.pp
+++ b/modules/profile/manifests/discovery_dashboards/base.pp
@@ -5,7 +5,7 @@
 #
 # filtertags: labs-project-search labs-project-shiny-r
 class profile::discovery_dashboards::base {
-include shiny_server
+include ::shiny_server
 
 $cran_packages = [
 # Needed by Search metrics dashboard:
@@ -15,17 +15,17 @@
 'highcharter',
 'countrycode'
 ]
-shiny_server::cran_pkg { $cran_packages:
+r::cran { $cran_packages:
 mirror => 'https://cran.cnr.berkeley.edu',
 }
 
 # 'polloi' contains common functions & data used by all the dashboards
-shiny_server::git_pkg { 'polloi':
+r::git { 'polloi':
 url => 'https://gerrit.wikimedia.org/r/wikimedia/discovery/polloi',
 }
 
 # 'googleCharts' is used on the Wikipedia.org portal metrics dashboard
-shiny_server::github_pkg { 'googleCharts':
+r::github { 'googleCharts':
 repo => 'jcheng5/googleCharts',
 }
 
diff --git a/modules/r/README.md b/modules/r/README.md
new file mode 100644
index 000..121bbe8
--- /dev/null
+++ b/modules/r/README.md
@@ -0,0 +1,53 @@
+# R: Statistical Software and Programming Language
+
+[R](https://www.r-project.org/) is a free software environment for statistical
+computing and graphics. This module facilitates setting up R in the computing
+evironment.
+
+Installs `r-base`, `r-base-dev`, `r-recommended` and Optimized BLAS (linear
+algebra) library, and makes the following resources available for installing
+R packages from various sources:
+
+- **r::cran** for installing from Comprehensive R Archive Network
+- the resource ID should be name of the package to be installed
+- *timeout*: default 300 (seconds)
+- *ensure*: default 'present', but also supports 'absent'
+- *mirror*: default 'https://cloud.r-project.org' which provides automatic
+  redirection to servers worldwide, sponsored by Rstudio. In practice, the
+  module uses [UC Berkeley mirror](https://cran.cnr.berkeley.edu/). For a
+  list of CRAN mirrors, see https://cran.r-project.org/mirrors.html
+- **r::git** for installing from any Git repository
+- the resource ID should be name of the package to be installed
+- *url* is forwarded to `devtools::install_git()`
+  e.g. 'https://gerrit.wikimedia.org/r/wikimedia/discovery/polloi'
+- *ensure*: default 'present', but also supports 'absent'
+- **r::github** for installing from a GitHub-hosted repository
+- the resource ID should be name of the package to be installed
+- *repo* is forwarded to `devtools::install_github()`
+  e.g. 'wikimedia/wikimedia-discovery-polloi'
+- *ensure*: default 'present', but also supports 'absent'
+
+The `notify` metaparameter is used to trigger a restart of the Shiny Server
+service.
+
+## Updating installed R packages
+
+There is a utility script - [update-library.R](files/update-library.R) - that 
is
+saved to /etc/R/update-library.R and has the following options:
+
+- `-p PACKAGE, --package=PACKAGE` for updating a specific package. If missing,
+  all packages installed from CRAN will be updated.
+- `--mirror=MIRROR` for specifying the CRAN mirror URL. The default is
+  'https://cloud.r-project.org'. For a list of CRAN mirrors, see
+  https://cran.r-project.org/mirrors.html
+- `-l LIBRARY, --library=LIBRARY` for updating packages in a specific library 
location.
+  If missing, uses `.libPaths()` just like `update.packages()` does.
+
+Non-CRAN packages such as 
[polloi](https://phabricator.wikimedia.org/diffusion/WDPL/)
+are updated only if

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Change `What's this?` i18n based on user testing

2017-07-18 Thread Jforrester (Code Review)

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

Change subject: RCFilters: Change `What's this?` i18n based on user testing
..

RCFilters: Change `What's this?` i18n based on user testing

Also minor tweak to the qqq to help translators understand.

Bug: T169053
Change-Id: If5aebae20d2e0037b28090d85cd9b076ac4b3178
---
M languages/i18n/en.json
M languages/i18n/qqq.json
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/69/366169/1

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 64f9b7b..a76eafc 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1371,7 +1371,7 @@
"rcfilters-invalid-filter": "Invalid filter",
"rcfilters-empty-filter": "No active filters. All contributions are 
shown.",
"rcfilters-filterlist-title": "Filters",
-   "rcfilters-filterlist-whatsthis": "What's this?",
+   "rcfilters-filterlist-whatsthis": "How do these work?",
"rcfilters-filterlist-feedbacklink": "Provide feedback on the new 
(beta) filters",
"rcfilters-highlightbutton-title": "Highlight results",
"rcfilters-highlightmenu-title": "Select a color",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index d98f8b0..c8f0e06 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1561,7 +1561,7 @@
"rcfilters-invalid-filter": "A label for an invalid filter.",
"rcfilters-empty-filter": "Placeholder for the filter list when no 
filters were chosen.",
"rcfilters-filterlist-title": "Title for the filters 
list.\n{{Identical|Filter}}",
-   "rcfilters-filterlist-whatsthis": "Caption for the link that opens a 
popup with explanations about this filter group.",
+   "rcfilters-filterlist-whatsthis": "Caption for the link that opens a 
popup with explanations about this filter group, explaining what it is and how 
it works.",
"rcfilters-filterlist-feedbacklink": "Caption for the link to the 
feedback page about the filters beta feature.",
"rcfilters-highlightbutton-title": "Title for the highlight button used 
to toggle the highlight feature on and off.",
"rcfilters-highlightmenu-title": "Title for the highlight menu used to 
select the highlight color for an individual filter.",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If5aebae20d2e0037b28090d85cd9b076ac4b3178
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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/core[master]: RCFilters: Log filter groupings

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: RCFilters: Log filter groupings
..


RCFilters: Log filter groupings

Depends-On: Ib9df52d708993f2ed29633251365d4af2b6a4761
Change-Id: I09b2d45cdca323d43cf91d0b21bed06f2db8183c
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
3 files changed, 72 insertions(+), 0 deletions(-)

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



diff --git 
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js 
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
index 75431d9..06fa0aa 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
@@ -888,6 +888,20 @@
};
 
/**
+* Get all selected items
+*
+* @return {mw.rcfilters.dm.FilterItem[]} Selected items
+*/
+   mw.rcfilters.dm.FiltersViewModel.prototype.getSelectedItems = function 
() {
+   var allSelected = [];
+
+   $.each( this.getFilterGroups(), function ( groupName, 
groupModel ) {
+   allSelected = allSelected.concat( 
groupModel.getSelectedItems() );
+   } );
+
+   return allSelected;
+   };
+   /**
 * Switch the current view
 *
 * @param {string} view View name
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js 
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 5858566..a9283b9 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -15,6 +15,8 @@
this.baseFilterState = {};
this.uriProcessor = null;
this.initializing = false;
+
+   this.prevLoggedItems = [];
};
 
/* Initialization */
@@ -221,6 +223,9 @@
this.filtersModel.toggleFilterSelected( filterName, 
false );
this.updateChangesList();
this.filtersModel.reassessFilterInteractions( 
filterItem );
+
+   // Log filter grouping
+   this.trackFilterGroupings( 'removefilter' );
}
 
if ( isHighlighted ) {
@@ -412,6 +417,9 @@
this.filtersModel.reassessFilterInteractions();
 
this.updateChangesList();
+
+   // Log filter grouping
+   this.trackFilterGroupings( 'savedfilters' );
}
};
 
@@ -802,4 +810,51 @@
);
};
 
+   /**
+* Track filter grouping usage
+*
+* @param {string} action Action taken
+*/
+   mw.rcfilters.Controller.prototype.trackFilterGroupings = function ( 
action ) {
+   var controller = this,
+   rightNow = new Date().getTime(),
+   randomIdentifier = String( mw.user.sessionId() ) + 
String( rightNow ) + String( Math.random() ),
+   // Get all current filters
+   filters = this.filtersModel.getSelectedItems().map( 
function ( item ) {
+   return item.getName();
+   } );
+
+   action = action || 'filtermenu';
+
+   // Check if these filters were the ones we just logged 
previously
+   // (Don't log the same grouping twice, in case the user 
opens/closes)
+   // the menu without action, or with the same result
+   if (
+   // Only log if the two arrays are different in size
+   filters.length !== this.prevLoggedItems.length ||
+   // Or if any filters are not the same as the cached 
filters
+   filters.some( function ( filterName ) {
+   return controller.prevLoggedItems.indexOf( 
filterName ) === -1;
+   } ) ||
+   // Or if any cached filters are not the same as given 
filters
+   this.prevLoggedItems.some( function ( filterName ) {
+   return filters.indexOf( filterName ) === -1;
+   } )
+   ) {
+   filters.forEach( function ( filterName ) {
+   mw.track(
+   'event.ChangesListFilterGrouping',
+   {
+   action: action,
+

[MediaWiki-commits] [Gerrit] mediawiki...Thanks[wmf/1.30.0-wmf.9]: Add missing jQueryMsg dependency for mobile diff view

2017-07-18 Thread Jdlrobson (Code Review)

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

Change subject: Add missing jQueryMsg dependency for mobile diff view
..

Add missing jQueryMsg dependency for mobile diff view

Bug: T170917
Change-Id: Ibca76902e0d748b95bb57e871993a4dc2664d5cd
(cherry picked from commit 545a7de5e2eaadaa7d245e92eabe472b784d6b1b)
---
M extension.json
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Thanks 
refs/changes/68/366168/1

diff --git a/extension.json b/extension.json
index 314b78f..5e30b49 100644
--- a/extension.json
+++ b/extension.json
@@ -102,6 +102,7 @@
],
"dependencies": [
"mediawiki.api",
+   "mediawiki.jqueryMsg",
"mediawiki.notify"
],
"targets": [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibca76902e0d748b95bb57e871993a4dc2664d5cd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Thanks
Gerrit-Branch: wmf/1.30.0-wmf.9
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Mattflaschen 

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Add tracking for execute button

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: Add tracking for execute button
..


Add tracking for execute button

Change-Id: Ib94b967882c7a6c7771ee98bbb45de31b926f68e
---
M wikibase/queryService/ui/App.js
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/wikibase/queryService/ui/App.js b/wikibase/queryService/ui/App.js
index 5592514..4a0cc90 100644
--- a/wikibase/queryService/ui/App.js
+++ b/wikibase/queryService/ui/App.js
@@ -550,6 +550,7 @@
SELF.prototype._handleQuerySubmit = function( e ) {
var self = this;
 
+   this._track( 'buttonClick.execute' );
if ( !this._hasRunFirstQuery ) {
this._track( 'firstQuery' );
this._hasRunFirstQuery = true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib94b967882c7a6c7771ee98bbb45de31b926f68e
Gerrit-PatchSet: 3
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: WIP getHostedCheckoutStatus

2017-07-18 Thread Ejegg (Code Review)

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

Change subject: WIP getHostedCheckoutStatus
..

WIP getHostedCheckoutStatus

Bug: T163948
Change-Id: I3d11fba2d4c900752c6e35d2182f412d95735696
---
M ingenico_gateway/config/var_map.yaml
M ingenico_gateway/ingenico.adapter.php
2 files changed, 29 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface 
refs/changes/67/366167/1

diff --git a/ingenico_gateway/config/var_map.yaml 
b/ingenico_gateway/config/var_map.yaml
index 79c88d8..fb21f7e 100644
--- a/ingenico_gateway/config/var_map.yaml
+++ b/ingenico_gateway/config/var_map.yaml
@@ -14,3 +14,5 @@
 surname: last_name
 merchantReference: order_id
 hostedCheckoutId: gateway_session_id
+id: gateway_txn_id
+statusCode: gateway_status
diff --git a/ingenico_gateway/ingenico.adapter.php 
b/ingenico_gateway/ingenico.adapter.php
index 127e5be..ec8031d 100644
--- a/ingenico_gateway/ingenico.adapter.php
+++ b/ingenico_gateway/ingenico.adapter.php
@@ -90,6 +90,18 @@
'hostedCheckoutId'
)
);
+
+   $this->transactions['getHostedCheckoutStatus'] = array(
+   'request' => array( 'hostedCheckoutId' ),
+   'response' => array(
+   'id',
+   'amount',
+   'currencyCode',
+   'avsResult',
+   'cvvResult',
+   'statusCode',
+   )
+   );
}
 
/**
@@ -107,6 +119,12 @@
);
}
 
+   /**
+* Make an API call to Ingenico Connect.
+*
+* @param array $data parameters for the transaction
+* @return bool whether the API call succeeded
+*/
public function curl_transaction( $data ) {
$email = $this->getData_Unstaged_Escaped( 'email' );
$this->logger->info( "Making API call for donor $email" );
@@ -120,11 +138,18 @@
switch( $this->getCurrentTransaction() ) {
case 'createHostedCheckout':
$result = $provider->createHostedPayment( $data 
);
-   $this->transaction_response->setRawResponse( 
json_encode( $result ) );
-   return true;
+   break;
+   case 'getHostedCheckoutStatus':
+   $result = $provider->getHostedPaymentStatus(
+   $data['hostedCheckoutId']
+   );
+   break;
default:
return false;
}
+
+   $this->transaction_response->setRawResponse( json_encode( 
$result ) );
+   return true;
}
 
public function getBasedir() {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d11fba2d4c900752c6e35d2182f412d95735696
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: RCFilters: Update schema revision for ChangesListFilterGrouping

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: RCFilters: Update schema revision for ChangesListFilterGrouping
..


RCFilters: Update schema revision for ChangesListFilterGrouping

Change-Id: Ic0f00752469fdb4ced045040b05b31b7ed7c4b3b
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index dca6592..48e9402 100644
--- a/extension.json
+++ b/extension.json
@@ -142,7 +142,7 @@
"schema.ChangesListFilterGrouping": {
"class": "ResourceLoaderSchemaModule",
"schema": "ChangesListFilterGrouping",
-   "revision": 16987669
+   "revision": 17008168
},
"schema.ChangesListClickTracking": {
"class": "ResourceLoaderSchemaModule",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic0f00752469fdb4ced045040b05b31b7ed7c4b3b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
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] wikidata...gui[master]: Make Result View more prominent and add help link

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: Make Result View more prominent and add help link
..


Make Result View more prominent and add help link

Bug:T170660
Change-Id: I793f299c5b7a5510cf42b36b0f67158e8f1d31f0
---
M index.html
M style.css
M wikibase/queryService/ui/ResultView.js
3 files changed, 21 insertions(+), 11 deletions(-)

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



diff --git a/index.html b/index.html
index deb1c17..7a53ca7 100644
--- a/index.html
+++ b/index.html
@@ -155,19 +155,22 @@

 

-   
-   
-   
-   
-Results in  ms  
-   
-   
-   
+   
+   





+   
+   https://www.wikidata.org/wiki/Wikidata:SPARQL_query_service/Wikidata_Query_Help/Result_Views;>
+   
+   
+   
+   
+   
+Results in  ms  
+   



diff --git a/style.css b/style.css
index 113da69..afb29dd 100644
--- a/style.css
+++ b/style.css
@@ -8,7 +8,6 @@
white-space: pre;
 }
 
-.query-total,
 #query-result,
 #hide-explorer {
display: none;
@@ -32,6 +31,10 @@
 
 .error-character {
background: lightsalmon;
+}
+
+.result {
+   display: none;
 }
 
 #query-result pre {
@@ -154,6 +157,9 @@
margin-bottom: 0;
 }
 
+.navbar .help {
+   padding-left: 0;
+}
 .navbar-right {
margin-right: 0;
 }
diff --git a/wikibase/queryService/ui/ResultView.js 
b/wikibase/queryService/ui/ResultView.js
index b12aedb..9dcf0a7 100644
--- a/wikibase/queryService/ui/ResultView.js
+++ b/wikibase/queryService/ui/ResultView.js
@@ -211,7 +211,7 @@
this._actionBar.show( 'wdqs-action-query', '', 'info', 100 );
 
$( '#query-result' ).empty().hide();
-   $( '.query-total' ).hide();
+   $( '.result' ).hide();
$( '#query-error' ).hide();
 
this._sparqlApi.query( query )
@@ -270,7 +270,8 @@
 
$( '#total-results' ).text( api.getResultLength() );
$( '#query-time' ).text( api.getExecutionTime() );
-   $( '.query-total' ).show();
+   $( '.result' ).show();
+
$( '#execute-button' ).prop( 'disabled', false );
 
var defaultBrowser = this._createResultBrowsers( 
api.getResultRawData() );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I793f299c5b7a5510cf42b36b0f67158e8f1d31f0
Gerrit-PatchSet: 2
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Chore: update styles

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: Chore: update styles
..


Chore: update styles

Updates bundled CSS with the latest from MobileFrontend, MinervaNeue,
and extensions from scripts/make-css-assets.bash. MinervaNeue was
configured with MinervaApplyKnownTemplateHacks set to true.

A manual resolution to keep margin rules was made and an email
requesting guiding for a future fix was sent:

  The Android app periodically pulls styles from Minerva/Neue to be
  statically bundled with the app. Something like:


https://en.wikipedia.org/w/load.php?modules=skins.minerva.base.reset|skins.minerva.content.styles=styles=&*=true

  A recent change moved a few of the rules from main.less to ui.less,
  which is not included the content.styles module:

.pre-content,
.content,
.post-content {
margin: 0 @contentMargin;
}

  If I understand the commit message correctly, the intent was just to
  DRY up the margin rules. However, as rules around these classes are
  present in other imports within the content.styles module, I think
  it's a mistake to omit these margin rules. Michael noticed that this
  omission causes a regression in the edit preview margins of the
  Wikipedia Android app when I tried to update the styles which sparked
  this email.

  What should I do? Here are some ideas:
  1 Move all these margin rules to another file and add it to
styles.less?
  2 Undo the margin change?
  3 Query additional modules? This is kind of dicey on Android but I'd
be curious to know if that's the best long term fix.
  4 Something else?

  There's not a time crunch because I can just ignore this change
  manually but it's not something I'd want to leave to manual resolution
  in the long term.

Change-Id: Ia6d76492e025ec8ee2643f85ce51c724f1b7b7d6
---
M app/src/main/assets/preview.css
M app/src/main/assets/styles.css
2 files changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/app/src/main/assets/preview.css b/app/src/main/assets/preview.css
index 72ab26b..43b84c8 100644
--- a/app/src/main/assets/preview.css
+++ b/app/src/main/assets/preview.css
@@ -329,9 +329,9 @@
 }
 a.external {
   background-image: 
url(data:image/png;base64,iVBORw0KGgoNSUhEUgoKCAYAAACNMs+9VElEQVR42n3PgQkAIAhEUXdqJ3dqJ3e6IoTPUSQcgj4EQ5IlUiLE0Jil3PECXhcHGBhZ8kg4hwxAu3MZeCGeyFnAXp4hqNQPnt7QL0nADpD6wHccLvnAKksq8iiaAElFTkSuQmCC);
-  background-image: 
url(/w/extensions/MobileFrontend/resources/skins.minerva.content.styles/images/external-link-ltr-icon.png?948bf)!ie;
+  background-image: 
url(/w/skins/MinervaNeue/resources/skins.minerva.content.styles/images/external-link-ltr-icon.png?948bf)!ie;
   background-image: linear-gradient(transparent, transparent), 
url(data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22UTF-8%22%20standalone%3D%22no%22%3F%3E%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2210%22%20height%3D%2210%22%3E%3Cpath%20fill%3D%22%23fff%22%20stroke%3D%22%2306c%22%20d%3D%22M.5%203.518h5.982V9.5H.5z%22%2F%3E%3Cpath%20d%3D%22M4.755-.16H9.99v5.39L8.417%206.774l-1.31-1.31L4.383%208.19%201.695%205.5l2.808-2.807-1.31-1.31z%22%20fill%3D%22%2306f%22%2F%3E%3Cpath%20d%3D%22M8.984.845l.022%204.884L7.19%203.91%204.308%206.79%203.08%205.567l2.882-2.88L4.112.833z%22%20fill%3D%22%23fff%22%2F%3E%3C%2Fsvg%3E);
-  background-image: -o-linear-gradient(transparent, transparent), 
url(/w/extensions/MobileFrontend/resources/skins.minerva.content.styles/images/external-link-ltr-icon.png?948bf);
+  background-image: -o-linear-gradient(transparent, transparent), 
url(/w/skins/MinervaNeue/resources/skins.minerva.content.styles/images/external-link-ltr-icon.png?948bf);
   background-repeat: no-repeat;
   background-position: center right;
   padding-right: 13px;
@@ -1438,4 +1438,4 @@
 figure[typeof~='mw:Video'] > figcaption,
 figure[typeof~='mw:Audio'] > figcaption {
   display: none;
-}
\ No newline at end of file
+}
diff --git a/app/src/main/assets/styles.css b/app/src/main/assets/styles.css
index 66ffae8..6808e7c 100644
--- a/app/src/main/assets/styles.css
+++ b/app/src/main/assets/styles.css
@@ -329,9 +329,9 @@
 }
 a.external {
   background-image: 
url(data:image/png;base64,iVBORw0KGgoNSUhEUgoKCAYAAACNMs+9VElEQVR42n3PgQkAIAhEUXdqJ3dqJ3e6IoTPUSQcgj4EQ5IlUiLE0Jil3PECXhcHGBhZ8kg4hwxAu3MZeCGeyFnAXp4hqNQPnt7QL0nADpD6wHccLvnAKksq8iiaAElFTkSuQmCC);
-  background-image: 
url(/w/extensions/MobileFrontend/resources/skins.minerva.content.styles/images/external-link-ltr-icon.png?948bf)!ie;
+  background-image: 
url(/w/skins/MinervaNeue/resources/skins.minerva.content.styles/images/external-link-ltr-icon.png?948bf)!ie;
   background-image: linear-gradient(transparent, transparent),

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Increase visibility of execute button

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: Increase visibility of execute button
..


Increase visibility of execute button

Increases size of execute button by 0.5em to make it more prominent.

Change-Id: I224e14e9b05f1d10dbf558fcbf28e483d96fa3d9
---
M style.css
1 file changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/style.css b/style.css
index 5f8f4ce..c3426f9 100644
--- a/style.css
+++ b/style.css
@@ -140,12 +140,15 @@
 }
 
 #query-box .toolbar-bottom {
-   padding-bottom: 0.5em;
padding-top: 1em;
vertical-align: bottom;
text-align: center;
 }
 
+#query-box .toolbar-bottom .fa {
+   font-size: 2em;
+}
+
 .jq-toast-single a {
border: none;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I224e14e9b05f1d10dbf558fcbf28e483d96fa3d9
Gerrit-PatchSet: 3
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Only enable VisualDiff on VE-supported content models

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: Only enable VisualDiff on VE-supported content models
..


Only enable VisualDiff on VE-supported content models

Change-Id: I71ea11aaed207c4f67cfd69455b90d87e5f14498
---
M VisualEditor.hooks.php
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 1a27f4c..2476587 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -92,6 +92,11 @@
return;
}
 
+   $veConfig = ConfigFactory::getDefaultInstance()->makeConfig( 
'visualeditor' );
+   if ( !ApiVisualEditor::isAllowedContentType( $veConfig, 
$diff->getTitle()->getContentModel() ) ) {
+   return;
+   }
+
$output->addModuleStyles( [
'ext.visualEditor.diffPage.init.styles',
'oojs-ui.styles.icons-alerts',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I71ea11aaed207c4f67cfd69455b90d87e5f14498
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
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] wikidata...gui[master]: [WIP] Complete fullscreen

2017-07-18 Thread Jonas Kress (WMDE) (Code Review)

Jonas Kress (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/366165 )

Change subject: [WIP] Complete fullscreen
..

[WIP] Complete fullscreen

Change-Id: I06d8f723df09611be73d13caeace2fcdf45271fe
---
M index.html
M style.css
M wikibase/queryService/ui/App.js
3 files changed, 21 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui 
refs/changes/65/366165/1

diff --git a/index.html b/index.html
index 4fab6e6..9f69e6a 100644
--- a/index.html
+++ b/index.html
@@ -36,7 +36,7 @@


 
-
+



diff --git a/style.css b/style.css
index 5f8f4ce..d1ffa1c 100644
--- a/style.css
+++ b/style.css
@@ -1,5 +1,10 @@
 body {
overflow-y: scroll;
+   width: 100%;
+height: 100%
+}
+.wikibase-queryservice {
+   background-color: white;
 }
 .error {
margin: 20px;
diff --git a/wikibase/queryService/ui/App.js b/wikibase/queryService/ui/App.js
index 5592514..4888af2 100644
--- a/wikibase/queryService/ui/App.js
+++ b/wikibase/queryService/ui/App.js
@@ -375,12 +375,25 @@
 
$( '.fullscreen' ).click( function( e ) {
e.preventDefault();
-   self._editor.toggleFullscreen();
-   self._editor.focus();
 
var $help = $( 'https://www.wikidata.org/wiki/Wikidata:SPARQL_query_service/Wikidata_Query_Help/SPARQL_Editor#Editor_Toolbar;>'
 )
.append( $.i18n( 
'wdqs-app-toast-leave-fullscreen' ) );
self._toast( $help, 'wdqs-app-toast-leave-fullscreen' );
+
+   var i = document.getElementById("app");
+
+   if (i.requestFullscreen) {
+   i.requestFullscreen();
+   } else if (i.webkitRequestFullscreen) {
+   i.webkitRequestFullscreen();
+   } else if (i.mozRequestFullScreen) {
+   i.mozRequestFullScreen();
+   } else if (i.msRequestFullscreen) {
+   i.msRequestFullscreen();
+   }
+
+   //self._editor.toggleFullscreen();
+   //self._editor.focus();
} );
 
$( window ).on( 'popstate', $.proxy( this._initQuery, this ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I06d8f723df09611be73d13caeace2fcdf45271fe
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labtest: labcontrol2001 use rabbitmq role

2017-07-18 Thread Rush (Code Review)

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

Change subject: labtest: labcontrol2001 use rabbitmq role
..

labtest: labcontrol2001 use rabbitmq role

All roads lead to a single role for this server via
the new role/profile model but still refactoring.

Bug: T167559
Change-Id: I70ef9378274c4acae1c8d662304446b1a5b1a64d
---
M manifests/site.pp
A modules/role/manifests/labs/openstack/nova/controller2.pp
M modules/role/manifests/wmcloud/openstack/control.pp
3 files changed, 112 insertions(+), 1 deletion(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index 4b94a85..488f3c9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1004,7 +1004,7 @@
 node 'labtestcontrol2001.wikimedia.org' {
 include ::standard
 include ::base::firewall
-role(labs::openstack::nova::controller, labs::puppetmaster)
+role(wmcloud::openstack::control, labs::openstack::nova::controller, 
labs::puppetmaster)
 
 # Labtest is weird; the mysql server is on labtestcontrol2001.  So
 #  we need some special fw rules to allow that
diff --git a/modules/role/manifests/labs/openstack/nova/controller2.pp 
b/modules/role/manifests/labs/openstack/nova/controller2.pp
new file mode 100644
index 000..e5d1fe9
--- /dev/null
+++ b/modules/role/manifests/labs/openstack/nova/controller2.pp
@@ -0,0 +1,110 @@
+# This is nova controller stuff
+class role::labs::openstack::nova::controller2 {
+system::role { $name: }
+
+require openstack
+include role::labs::openstack::glance::server
+include role::labs::openstack::keystone::server
+include ::openstack::nova::conductor
+include ::openstack::nova::spiceproxy
+include ::openstack::nova::scheduler
+include ::openstack::clientlib
+include role::labs::openstack::nova::common
+$novaconfig = $role::labs::openstack::nova::common::novaconfig
+$designateconfig = hiera_hash('designateconfig', {})
+
+class { '::openstack::adminscripts':
+novaconfig => $novaconfig
+}
+
+class { '::openstack::envscripts':
+novaconfig  => $novaconfig,
+designateconfig => $designateconfig
+}
+
+class { '::openstack::spreadcheck':
+novaconfig => $novaconfig
+}
+
+# TOBE: hiera'd
+$labs_vms = $novaconfig['fixed_range']
+$labs_metal = join(hiera('labs_baremetal_servers', []), ' ')
+$wikitech = ipresolve(hiera('labs_osm_host'),4)
+$horizon = ipresolve(hiera('labs_horizon_host'),4)
+$api_host = ipresolve(hiera('labs_nova_api_host'),4)
+$spare_master = ipresolve(hiera('labs_nova_controller_spare'),4)
+$designate = ipresolve(hiera('labs_designate_hostname'),4)
+$designate_secondary = 
ipresolve(hiera('labs_designate_hostname_secondary'))
+$monitoring = '208.80.154.14 208.80.153.74 208.80.155.119'
+$labs_nodes = hiera('labs_host_ips')
+
+# mysql access from iron
+ferm::service { 'mysql_iron':
+proto  => 'tcp',
+port   => '3306',
+srange => '@resolve(iron.wikimedia.org)',
+}
+
+# mysql monitoring access from tendril (db1011)
+ferm::service { 'mysql_tendril':
+proto  => 'tcp',
+port   => '3306',
+srange => '@resolve(tendril.wikimedia.org)',
+}
+
+include network::constants
+$prod_networks = join($network::constants::production_networks, ' ')
+$labs_networks = join($network::constants::labs_networks, ' ')
+
+$fwrules = {
+wikitech_ssh_public => {
+rule  => 'saddr (0.0.0.0/0) proto tcp dport (ssh) ACCEPT;',
+},
+dns_public => {
+rule  => 'saddr (0.0.0.0/0) proto (udp tcp) dport 53 ACCEPT;',
+},
+spice_consoles => {
+rule  => 'saddr (0.0.0.0/0) proto (udp tcp) dport 6082 ACCEPT;',
+},
+keystone_redis_replication => {
+rule  => "saddr (${spare_master}) proto tcp dport (6379) ACCEPT;",
+},
+# keystone admin API only for openstack services that might need it
+keystone_admin => {
+rule  => "saddr (${labs_nodes} ${spare_master} ${api_host}
+ ${designate} ${designate_secondary} ${horizon}
+ ${wikitech}
+ ) proto tcp dport (35357) ACCEPT;",
+},
+# keystone public API for all prod hosts and labs instances
+keystone_public => {
+rule  => "saddr (${prod_networks} ${labs_networks}
+ ) proto tcp dport (5000) ACCEPT;",
+},
+# glance API for all prod hosts and labs instances
+glance => {
+rule  => "saddr (${prod_networks} ${labs_networks}
+ ) proto tcp dport (9292) ACCEPT;",
+},
+mysql_nova => {
+rule  => "saddr ${labs_nodes} proto

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Only open one 'Whats This' popup at a time

2017-07-18 Thread Mooeypoo (Code Review)

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

Change subject: RCFilters: Only open one 'Whats This' popup at a time
..

RCFilters: Only open one 'Whats This' popup at a time

Remove 'overlay' and this.$element from the $autoCloseIgnore, since
the entire popup is in the overlay anyways.

Bug: T169047
Change-Id: I57300413297d86eca9bcc3d49766f4e41ab628be
---
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuSectionOptionWidget.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/64/366164/1

diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuSectionOptionWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuSectionOptionWidget.js
index 9f41712..cb730c9 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuSectionOptionWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuSectionOptionWidget.js
@@ -72,7 +72,7 @@
classes: [ 
'mw-rcfilters-ui-filterMenuSectionOptionWidget-whatsThisButton' ],
flags: [ 'progressive' ],
popup: {
-   $autoCloseIgnore: this.$element.add( 
this.$overlay ),
+   autoClose: true,
padded: false,
align: 'center',
position: 'above',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I57300413297d86eca9bcc3d49766f4e41ab628be
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]: labtest: rabbitmq for openstack control node

2017-07-18 Thread Rush (Code Review)

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

Change subject: labtest: rabbitmq for openstack control node
..


labtest: rabbitmq for openstack control node

refactor as module/profile/role model

We are untangling the 'openstack' module, this
supercedes the rabbitmq logic mixed in there and
that logic will be removed once this is ready.

Bug: T167559
Change-Id: If2a5b78856104d9b75d4d3e2c83923628fb2d3be
---
A modules/profile/manifests/rabbitmq/server.pp
A modules/rabbitmq/files/rabbitmq.py
A modules/rabbitmq/files/rabbitmqadmin
A modules/rabbitmq/manifests/init.pp
A modules/rabbitmq/manifests/monitor.pp
A modules/rabbitmq/templates/rabbitmq-server.default.erb
A modules/role/manifests/wmcloud/openstack/control.pp
7 files changed, 1,329 insertions(+), 0 deletions(-)

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



diff --git a/modules/profile/manifests/rabbitmq/server.pp 
b/modules/profile/manifests/rabbitmq/server.pp
new file mode 100644
index 000..0a5f95b
--- /dev/null
+++ b/modules/profile/manifests/rabbitmq/server.pp
@@ -0,0 +1,15 @@
+class profile::rabbitmq::server(
+$monitor_user = hiera('profile::rabbitmq::monitor::user'),
+$monitor_password = hiera('profile::rabbitmq::monitor::password'),
+$file_handles = hiera('profile::rabbitmq::file_handles'),
+){
+
+class { 'rabbitmq':
+file_handles => $file_handles,
+}
+
+class { 'rabbitmq::monitor':
+rabbit_monitor_username => $monitor_user,
+rabbit_monitor_password => $monitor_password,
+}
+}
diff --git a/modules/rabbitmq/files/rabbitmq.py 
b/modules/rabbitmq/files/rabbitmq.py
new file mode 100644
index 000..76c6aa0
--- /dev/null
+++ b/modules/rabbitmq/files/rabbitmq.py
@@ -0,0 +1,264 @@
+# coding=utf-8
+
+"""
+Collects data from RabbitMQ through the admin interface
+
+ Notes
+  ** With added support for breaking down queue metrics by vhost, we have
+ attempted to keep results generated by existing configurations from
+ changing. This means that the old behaviour of clobbering queue metrics
+ when a single queue name exists in multiple vhosts still exists if the
+ configuration is not updated. If no vhosts block is defined it will also
+ keep the metric path as it was historically with no vhost name in it.
+
+old path => systems.myServer.rabbitmq.queues.myQueue.*
+new path => systems.myServer.rabbitmq.myVhost.queues.myQueue.*
+
+  ** If a [vhosts] section exists but is empty, then no queues will be polled.
+  ** To poll all vhosts and all queues, add the following.
+  **   [vhosts]
+  **   * = *
+  **
+"""
+
+import diamond.collector
+import re
+from urlparse import urljoin
+from urllib import quote
+import urllib2
+from base64 import b64encode
+
+try:
+import json
+except ImportError:
+import simplejson as json
+
+
+class RabbitMQClient(object):
+"""
+Tiny interface into the rabbit http api
+"""
+
+def __init__(self, host, user, password, timeout=5, scheme="http"):
+self.base_url = '%s://%s/api/' % (scheme, host)
+self.timeout = timeout
+self._authorization = 'Basic ' + b64encode('%s:%s' % (user, password))
+
+def do_call(self, path):
+url = urljoin(self.base_url, path)
+req = urllib2.Request(url)
+req.add_header('Authorization', self._authorization)
+return json.load(urllib2.urlopen(req, timeout=self.timeout))
+
+def get_all_vhosts(self):
+return self.do_call('vhosts')
+
+def get_vhost_names(self):
+return [i['name'] for i in self.get_all_vhosts()]
+
+def get_queues(self, vhost=None):
+path = 'queues'
+if vhost:
+vhost = quote(vhost, '')
+path += '/%s' % vhost
+
+queues = self.do_call(path)
+return queues or []
+
+def get_overview(self):
+return self.do_call('overview')
+
+def get_nodes(self):
+return self.do_call('nodes')
+
+def get_node(self, node):
+return self.do_call('nodes/%s' % node)
+
+
+class RabbitMQCollector(diamond.collector.Collector):
+
+def get_default_config_help(self):
+config_help = super(RabbitMQCollector, self).get_default_config_help()
+config_help.update({
+'host': 'Hostname and port to collect from',
+'user': 'Username',
+'password': 'Password',
+'replace_dot':
+'A value to replace dot in queue names and vhosts names by',
+'replace_slash':
+'A value to replace a slash in queue names and vhosts names by',
+'queues': 'Queues to publish. Leave empty to publish all.',
+'vhosts':
+'A list of vhosts and queues for which we want to collect',
+'queues_ignored':
+'A list of queues or regexes for queue names not to report on.',
+

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Only enable VisualDiff on VE-supported content models

2017-07-18 Thread Esanders (Code Review)

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

Change subject: Only enable VisualDiff on VE-supported content models
..

Only enable VisualDiff on VE-supported content models

Change-Id: I71ea11aaed207c4f67cfd69455b90d87e5f14498
---
M VisualEditor.hooks.php
1 file changed, 5 insertions(+), 0 deletions(-)


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

diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 1a27f4c..2476587 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -92,6 +92,11 @@
return;
}
 
+   $veConfig = ConfigFactory::getDefaultInstance()->makeConfig( 
'visualeditor' );
+   if ( !ApiVisualEditor::isAllowedContentType( $veConfig, 
$diff->getTitle()->getContentModel() ) ) {
+   return;
+   }
+
$output->addModuleStyles( [
'ext.visualEditor.diffPage.init.styles',
'oojs-ui.styles.icons-alerts',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I71ea11aaed207c4f67cfd69455b90d87e5f14498
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/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] mediawiki/core[master]: RCFilters: Increase the initial height of the loading box

2017-07-18 Thread Mooeypoo (Code Review)

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

Change subject: RCFilters: Increase the initial height of the loading box
..

RCFilters: Increase the initial height of the loading box

Bug: T168651
Change-Id: Ia4a079c9d177ad02462a212a60f725ea1943
---
M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/62/366162/1

diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less 
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
index 844e41c..6277fd9 100644
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
@@ -10,7 +10,7 @@
}
 
.rcfilters-head {
-   min-height: 270px;
+   min-height: 310px;
&:not( .mw-rcfilters-ui-ready ) {
/* @embed */
background-image: url( ../images/pending.gif );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4a079c9d177ad02462a212a60f725ea1943
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] mediawiki...DonationInterface[master]: Make getLogMatches static

2017-07-18 Thread Ejegg (Code Review)

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

Change subject: Make getLogMatches static
..

Make getLogMatches static

This will let us re-use it in API tests

Change-Id: Idfaff167388e9f338270d17307baf9d6a4643b69
---
M tests/phpunit/Adapter/AstroPay/AstroPayTest.php
M tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTest.php
M tests/phpunit/Adapter/GlobalCollect/GlobalCollectTest.php
M tests/phpunit/Adapter/GlobalCollect/ResultSwitcherTest.php
M tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
M tests/phpunit/DonationDataTest.php
M tests/phpunit/DonationInterfaceTestCase.php
M tests/phpunit/GatewayPageTest.php
M tests/phpunit/IntegrationTest.php
M tests/phpunit/LoggingTest.php
10 files changed, 25 insertions(+), 29 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface 
refs/changes/61/366161/1

diff --git a/tests/phpunit/Adapter/AstroPay/AstroPayTest.php 
b/tests/phpunit/Adapter/AstroPay/AstroPayTest.php
index 59e1185..24c5c54 100644
--- a/tests/phpunit/Adapter/AstroPay/AstroPayTest.php
+++ b/tests/phpunit/Adapter/AstroPay/AstroPayTest.php
@@ -158,7 +158,7 @@
$errors[0]->getErrorCode(),
'Wrong error for code "1"'
);
-   $logged = $this->getLogMatches( LogLevel::WARNING, '/This error 
message should appear in the log./' );
+   $logged = self::getLogMatches( LogLevel::WARNING, '/This error 
message should appear in the log./' );
$this->assertNotEmpty( $logged );
}
 
@@ -212,7 +212,7 @@
'Should be an error in PaymentResult'
);
 
-   $logged = $this->getLogMatches( LogLevel::WARNING, '/This error 
message should appear in the log./' );
+   $logged = self::getLogMatches( LogLevel::WARNING, '/This error 
message should appear in the log./' );
$this->assertNotEmpty( $logged );
// TODO: Should this really be a refresh, or should we finalize 
to failed here?
$this->assertTrue( $result->getRefresh(), 'PaymentResult should 
be a refresh' );
diff --git 
a/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTest.php 
b/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTest.php
index 8053400..86d457b 100644
--- a/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTest.php
+++ b/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanAdapterTest.php
@@ -151,7 +151,7 @@
return $error->getErrorCode() == '101';
};
$this->assertNotEmpty( array_filter( $errors, $finder ), 
'Orphan adapter needs error 101 to consider it rectified' );
-   $loglines = $this->getLogMatches( LogLevel::INFO, "/Got error 
code $code, not retrying to avoid MasterCard fines./" );
+   $loglines = self::getLogMatches( LogLevel::INFO, "/Got error 
code $code, not retrying to avoid MasterCard fines./" );
$this->assertNotEmpty( $loglines, "GC Error $code is not 
generating the expected payments log error" );
}
 
diff --git a/tests/phpunit/Adapter/GlobalCollect/GlobalCollectTest.php 
b/tests/phpunit/Adapter/GlobalCollect/GlobalCollectTest.php
index 972d8b0..ee8e3d3 100644
--- a/tests/phpunit/Adapter/GlobalCollect/GlobalCollectTest.php
+++ b/tests/phpunit/Adapter/GlobalCollect/GlobalCollectTest.php
@@ -423,18 +423,18 @@
$gateway = $this->getFreshGatewayObject( $init );
$gateway->setDummyGatewayResponseCode( '2150' );
$gateway->do_transaction( 'GET_ORDERSTATUS' );
-   $loglines = $this->getLogMatches( LogLevel::ERROR, 
'/Investigation required!/' );
+   $loglines = self::getLogMatches( LogLevel::ERROR, 
'/Investigation required!/' );
$this->assertNotEmpty( $loglines, 'GC Error 2150 is not 
generating the expected payments log error' );
 
//Reset logs
-   $this->testLogger->messages = array();
+   DonationLoggerFactory::$overrideLogger->messages = array();
 
//Most irritating version of 20001000 - They failed to enter an 
expiration date on GC's form. This should log some specific info, but not an 
error.
$gateway = $this->getFreshGatewayObject( $init );
$gateway->setDummyGatewayResponseCode( '20001000-expiry' );
$gateway->do_transaction( 'GET_ORDERSTATUS' );
$this->verifyNoLogErrors();
-   $loglines = $this->getLogMatches( LogLevel::INFO, 
'/processResponse:.*EXPIRYDATE/' );
+   $loglines = self::getLogMatches( LogLevel::INFO, 
'/processResponse:.*EXPIRYDATE/' );
$this->assertNotEmpty( $loglines, 'GC Error 20001000-expiry is 
not generating the expected payments log line' );

[MediaWiki-commits] [Gerrit] operations/puppet[production]: l10nupdate: Reduce code duplication in git clone operations

2017-07-18 Thread Dzahn (Code Review)

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

Change subject: l10nupdate: Reduce code duplication in git clone operations
..


l10nupdate: Reduce code duplication in git clone operations

Change-Id: If86301a13c419a0f67913f57ac061e06c92bf64a
---
M modules/scap/files/l10nupdate-1
1 file changed, 16 insertions(+), 16 deletions(-)

Approvals:
  Chad: Looks good to me, but someone else must approve
  BryanDavis: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/scap/files/l10nupdate-1 b/modules/scap/files/l10nupdate-1
index 5a68506..adf7a9b 100755
--- a/modules/scap/files/l10nupdate-1
+++ b/modules/scap/files/l10nupdate-1
@@ -46,23 +46,11 @@
 echo "Updating git clone ..."
 for path in $GITREPOS
 do
-   if [ -d $GITDIR/$path ]
+   if [ ! -d $GITDIR/$path ]
then
-   # Checkout exists, update it
-   if cd $GITDIR/$path && git pull && git submodule update --init
-   then
-   echo "Updated $path"
-   else
-   banglog "LocalisationUpdate failed: git pull of $path 
failed"
-   echo "Updating $path FAILED."
-   exit 1
-   fi
-   else
-   # Create the checkout's parent directory
-   if mkdir -p `dirname $GITDIR/$path` &&
-   git clone $GITURL/$path $GITDIR/$path &&
-   cd $GITDIR/$path &&
-   git submodule update --init
+   # Create the checkout's parent directory and initial clone
+   if mkdir -p $(dirname $GITDIR/$path) &&
+   git clone $GITURL/$path $GITDIR/$path
then
echo "Cloned $path"
else
@@ -71,6 +59,18 @@
exit 1
fi
fi
+
+   cd $GITDIR/$path
+   # Update checkout of repo
+   if git pull &&
+   git submodule update --init --recursive
+   then
+   echo "Updated $path"
+   else
+   banglog "LocalisationUpdate failed: git pull of $path failed"
+   echo "Updating $path FAILED."
+   exit 1
+   fi
 done
 echo "git clone updated."
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If86301a13c419a0f67913f57ac061e06c92bf64a
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: Yuvipanda 
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]: maintenance: Add --dry-run option to deleteDefaultMessages.php

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: maintenance: Add --dry-run option to deleteDefaultMessages.php
..


maintenance: Add --dry-run option to deleteDefaultMessages.php

For back-compat, keep the default as-is, because it is also
used as a post-update script by the installer.

But for convenience and safe manual use, do add a dry-run option.
(Ideally this would be a --delete option and dry-run by default.)

Change-Id: I3ca70f15f50b66f9d19fa705cef9a4aae2dd4e5c
---
M maintenance/deleteDefaultMessages.php
1 file changed, 15 insertions(+), 5 deletions(-)

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



diff --git a/maintenance/deleteDefaultMessages.php 
b/maintenance/deleteDefaultMessages.php
index 69f4f89..ba8662a 100644
--- a/maintenance/deleteDefaultMessages.php
+++ b/maintenance/deleteDefaultMessages.php
@@ -35,6 +35,7 @@
parent::__construct();
$this->addDescription( 'Deletes all pages in the MediaWiki 
namespace' .
' which were last edited by "MediaWiki default"' );
+   $this->addOption( 'dry-run', 'Perform a dry run, delete 
nothing' );
}
 
public function execute() {
@@ -52,14 +53,23 @@
);
 
if ( $dbr->numRows( $res ) == 0 ) {
-   # No more messages left
+   // No more messages left
$this->output( "done.\n" );
-
return;
}
 
-   # Deletions will be made by $user temporarly added to the bot 
group
-   # in order to hide it in RecentChanges.
+   $dryrun = $this->hasOption( 'dry-run' );
+   if ( $dryrun ) {
+   foreach ( $res as $row ) {
+   $title = Title::makeTitle( 
$row->page_namespace, $row->page_title );
+   $this->output( "\n* [[$title]]" );
+   }
+   $this->output( "\n\nRun again without --dry-run to 
delete these pages.\n" );
+   return;
+   }
+
+   // Deletions will be made by $user temporarly added to the bot 
group
+   // in order to hide it in RecentChanges.
$user = User::newFromName( 'MediaWiki default' );
if ( !$user ) {
$this->error( "Invalid username", true );
@@ -67,7 +77,7 @@
$user->addGroup( 'bot' );
$wgUser = $user;
 
-   # Handle deletion
+   // Handle deletion
$this->output( "\n...deleting old default messages (this may 
take a long time!)...", 'msg' );
$dbw = $this->getDB( DB_MASTER );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3ca70f15f50b66f9d19fa705cef9a4aae2dd4e5c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Gilles 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Parent5446 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Siebrand 
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...LoginNotify[master]: Enqueue jobs postsend

2017-07-18 Thread MaxSem (Code Review)

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

Change subject: Enqueue jobs postsend
..

Enqueue jobs postsend

Bug: T170825
Change-Id: I6425a2065693739d117474fb8f60abb0038c8e90
---
M includes/LoginNotify.php
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LoginNotify 
refs/changes/60/366160/1

diff --git a/includes/LoginNotify.php b/includes/LoginNotify.php
index b0cd393..bf181cb 100644
--- a/includes/LoginNotify.php
+++ b/includes/LoginNotify.php
@@ -11,6 +11,7 @@
 use BagOStuff;
 use CentralAuthUser;
 use Config;
+use DeferredUpdates;
 use EchoEvent;
 use JobQueueGroup;
 use JobSpecification;
@@ -777,6 +778,8 @@
'resultSoFar' => $resultSoFar,
]
);
-   JobQueueGroup::singleton()->push( $job );
+   DeferredUpdates::addCallableUpdate( function () use ( $job ) {
+   JobQueueGroup::singleton()->push( $job );
+   } );
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6425a2065693739d117474fb8f60abb0038c8e90
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
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] mediawiki...jobrunner[master]: Limit how much work the Lua chron script can do at once

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: Limit how much work the Lua chron script can do at once
..


Limit how much work the Lua chron script can do at once

This limits the chance of tying up the redis server too long.

Change-Id: I7729c53ab5bd2059fdd513cf9ede41c1aefe260a
---
M redisJobChronService
1 file changed, 8 insertions(+), 5 deletions(-)

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



diff --git a/redisJobChronService b/redisJobChronService
index c17cac8..9c7f9d4 100755
--- a/redisJobChronService
+++ b/redisJobChronService
@@ -10,7 +10,7 @@
 RedisJobService::checkEnvironment();
 
 class RedisJobChronService extends RedisJobService {
-   const LUA_WAIT_US = 5000; // time to wait between LUA scripts
+   const LUA_WAIT_US = 5000; // time to wait between Lua scripts
const PERIOD_WAIT_US = 1e6; // time between task runs
 
/**
@@ -294,6 +294,8 @@
/** @var string[] JSON encoded queue name list */
private $queueIds;
 
+   const LUA_MAX_JOBS = 500; // limit on the number of jobs to change 
state in a Lua script
+
/**
 * @param RedisJobChronService $service
 * @param array $queueIds JSON encoded queue name list (type, domain)
@@ -331,6 +333,7 @@
$this->service->getAttemptsForType( $type ), # 
ARGV[3]
$now, # ARGV[4]
$queueId, # ARGV[5]
+   self::LUA_MAX_JOBS # ARGV[6]
),
'keys' => 7 # number of first argument(s) that are keys
);
@@ -355,7 +358,7 @@
static $script =
<
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Standardize pending queue message and logging in API

2017-07-18 Thread Ejegg (Code Review)

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

Change subject: Standardize pending queue message and logging in API
..

Standardize pending queue message and logging in API

Needed for the new PayPal EC redirect flow, as the last change
removed pending messages and logging.

This patch makes the donate API call the same logPending method that
the GatewayPage class calls when the payment result is a redirect.

This patch also adds Adyen API tests

TODO: test invalid submissions, look at logged messages.

Bug: T167923
Change-Id: I4ac8eb79fa8ab697eed272ef14a5fd6bf412dc55
---
M adyen_gateway/adyen.adapter.php
M gateway_common/donation.api.php
M globalcollect_gateway/globalcollect.adapter.php
A tests/phpunit/Adapter/Adyen/AdyenApiTest.php
M tests/phpunit/Adapter/GlobalCollect/GlobalCollectApiTest.php
M tests/phpunit/Adapter/PayPal/PayPalApiTest.php
M tests/phpunit/DonationInterfaceApiTestCase.php
7 files changed, 155 insertions(+), 24 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface 
refs/changes/59/366159/1

diff --git a/adyen_gateway/adyen.adapter.php b/adyen_gateway/adyen.adapter.php
index 47896f2..4542a24 100644
--- a/adyen_gateway/adyen.adapter.php
+++ b/adyen_gateway/adyen.adapter.php
@@ -165,7 +165,7 @@
if ( !$this->validatedOK() ){
//If the data didn't validate okay, prevent all data 
transmissions.
$response = $this->getFailedValidationResponse();
-   $this->logger->info( "Failed Validation. Aborting 
$transaction " . print_r( $this->errors, true ) );
+   $this->logger->info( "Failed Validation. Aborting 
$transaction " . print_r( $this->errorState, true ) );
return $response;
}
$this->transaction_response = new PaymentTransactionResponse();
@@ -196,10 +196,9 @@
'FORMACTION' => $formaction,
'gateway_params' => 
$requestParams,
) );
-   $this->logger->info( "launching 
external iframe request: " . print_r( $requestParams, true )
+   $this->logger->info(
+   "launching external iframe 
request: " . print_r( $requestParams, true )
);
-   $this->logPaymentDetails();
-   $this->sendPendingMessage();
break;
}
}
diff --git a/gateway_common/donation.api.php b/gateway_common/donation.api.php
index 7ad1075..107f62c 100644
--- a/gateway_common/donation.api.php
+++ b/gateway_common/donation.api.php
@@ -62,6 +62,7 @@
$outputResult['status'] = 
$result->getCommunicationStatus();
}
 
+   $errors = $result->getErrors();
$data = $result->getData();
if ( !empty( $data ) ) {
if ( array_key_exists( 'PAYMENT', $data )
@@ -71,6 +72,9 @@
}
if ( array_key_exists( 'FORMACTION', $data ) ) {
$outputResult['formaction'] = 
$data['FORMACTION'];
+   if ( empty( $errors ) ) {
+   $gatewayObj->logPending();
+   }
}
if ( array_key_exists( 'gateway_params', $data ) ) {
$outputResult['gateway_params'] = 
$data['gateway_params'];
@@ -82,7 +86,6 @@
$outputResult['orderid'] = $data['ORDERID'];
}
}
-   $errors = $result->getErrors();
if ( !empty( $errors ) ) {
$outputResult['errors'] = $this->serializeErrors( 
$errors, $gatewayObj );
$this->getResult()->setIndexedTagName( 
$outputResult['errors'], 'error' );
diff --git a/globalcollect_gateway/globalcollect.adapter.php 
b/globalcollect_gateway/globalcollect.adapter.php
index c3b94d8..f509250 100644
--- a/globalcollect_gateway/globalcollect.adapter.php
+++ b/globalcollect_gateway/globalcollect.adapter.php
@@ -1691,24 +1691,6 @@
}
}
 
-   /**
-* post-process function for INSERT_ORDERWITHPAYMENT.
-* This gets called by executeIfFunctionExists, in do_transaction.
-*/
-   protected function post_process_insert_orderwithpayment(){
-   //yeah, we absolutely want to do this for every one of these.
-   if ( $this->getTransactionStatus() === true ) {
-

[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Move message cleaning function to base test

2017-07-18 Thread Ejegg (Code Review)

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

Change subject: Move message cleaning function to base test
..

Move message cleaning function to base test

Change-Id: Ib7657a72081d35df22feddfffe7a24de3e290230
---
M tests/phpunit/Adapter/GlobalCollect/GlobalCollectApiTest.php
M tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
M tests/phpunit/DonationInterfaceTestCase.php
3 files changed, 14 insertions(+), 16 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface 
refs/changes/58/366158/1

diff --git a/tests/phpunit/Adapter/GlobalCollect/GlobalCollectApiTest.php 
b/tests/phpunit/Adapter/GlobalCollect/GlobalCollectApiTest.php
index 285495d..0247286 100644
--- a/tests/phpunit/Adapter/GlobalCollect/GlobalCollectApiTest.php
+++ b/tests/phpunit/Adapter/GlobalCollect/GlobalCollectApiTest.php
@@ -29,11 +29,10 @@
$this->assertNotEmpty( $match, 'GC API not setting proper 
return url' );
$message = DonationQueue::instance()->pop( 'pending' );
$this->assertNotNull( $message, 'Not sending a message to the 
pending queue' );
-   SourceFields::removeFromMessage( $message );
+   DonationInterfaceTestCase::unsetVariableFields( $message );
$expected = array(
'gateway_txn_id' => '626113410',
'response' => 'Response Status: 20',
-   'gateway_account' => 'test',
'fee' => 0,
'utm_source' => '..cc',
'language' => 'en',
diff --git a/tests/phpunit/Adapter/PayPal/PayPalExpressTest.php 
b/tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
index 35b9b6a..7ea9f12 100644
--- a/tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
+++ b/tests/phpunit/Adapter/PayPal/PayPalExpressTest.php
@@ -31,15 +31,6 @@
) );
}
 
-   protected function unsetVariableFields( &$message ) {
-   $fields = array(
-   'date', 'source_enqueued_time', 'source_host', 
'source_run_id', 'source_version', 'gateway_account'
-   );
-   foreach ( $fields as $field ) {
-   unset( $message[$field] );
-   }
-   }
-
function testPaymentSetup() {
$init = array(
'amount' => 1.55,
@@ -62,7 +53,7 @@
);
$message = DonationQueue::instance()->pop( 'pending' );
$this->assertNotEmpty( $message, 'Missing pending message' );
-   $this->unsetVariableFields( $message );
+   self::unsetVariableFields( $message );
$expected = array(
'country' => 'US',
'fee' => '0',
@@ -110,7 +101,7 @@
 
$message = DonationQueue::instance()->pop( 'donations' );
$this->assertNotNull( $message, 'Not sending a message to the 
donations queue' );
-   $this->unsetVariableFields( $message );
+   self::unsetVariableFields( $message );
$expected = array (
'contribution_tracking_id' => 
$init['contribution_tracking_id'],
'country' => 'US',
@@ -160,8 +151,8 @@
 
$message = DonationQueue::instance()->pop( 'donations' );
$this->assertNotNull( $message, 'Not sending a message to the 
donations queue' );
-   $this->unsetVariableFields( $message );
-   $expected = array (
+   self::unsetVariableFields( $message );
+   $expected = array(
'contribution_tracking_id' => 
$init['contribution_tracking_id'],
'country' => 'US',
'fee' => '0',
diff --git a/tests/phpunit/DonationInterfaceTestCase.php 
b/tests/phpunit/DonationInterfaceTestCase.php
index c3548ae..a418960 100644
--- a/tests/phpunit/DonationInterfaceTestCase.php
+++ b/tests/phpunit/DonationInterfaceTestCase.php
@@ -19,7 +19,6 @@
 use SmashPig\Core\Context;
 use SmashPig\Tests\TestingContext;
 use SmashPig\Tests\TestingGlobalConfiguration;
-use SmashPig\Tests\TestingProviderConfiguration;
 use Wikimedia\TestingAccessWrapper;
 
 /**
@@ -710,4 +709,13 @@
}
return $innerHTML;
}
+
+   public static function unsetVariableFields( &$message ) {
+   $fields = array(
+   'date', 'source_enqueued_time', 'source_host', 
'source_run_id', 'source_version', 'gateway_account'
+   );
+   foreach ( $fields as $field ) {
+   unset( $message[$field] );
+   }
+   }
 }

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

Gerrit-MessageType: newchange

[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: Don't print #siteSub

2017-07-18 Thread Jdlrobson (Code Review)

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

Change subject: Don't print #siteSub
..

Don't print #siteSub

Bug: T169823
Change-Id: I45f0abe6ab9378830fa59356b29ff6953962f477
---
M VectorTemplate.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector 
refs/changes/55/366155/1

diff --git a/VectorTemplate.php b/VectorTemplate.php
index 9b0c80c..d3eb051 100644
--- a/VectorTemplate.php
+++ b/VectorTemplate.php
@@ -123,7 +123,7 @@
data['isarticle'] ) {
?>
-   msg( 
'tagline' ) ?>
+   msg( 'tagline' ) ?>


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I45f0abe6ab9378830fa59356b29ff6953962f477
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: planet: Add cookiesandcodeblog to English Planet

2017-07-18 Thread Dzahn (Code Review)

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

Change subject: planet: Add cookiesandcodeblog to English Planet
..


planet: Add cookiesandcodeblog to English Planet

All the posts are about the Commons Android app,
so it's relevant.

Change-Id: I14c2b6c7409e7e581fd762b06c7d34a24e558eca
---
M modules/planet/templates/feeds/en_config.erb
M modules/planet/templates/feeds_rawdog/en_config.erb
2 files changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/modules/planet/templates/feeds/en_config.erb 
b/modules/planet/templates/feeds/en_config.erb
index 030c948..7cc5708 100644
--- a/modules/planet/templates/feeds/en_config.erb
+++ b/modules/planet/templates/feeds/en_config.erb
@@ -565,3 +565,6 @@
 
 [https://clkoerner.com/feed/?cat=197%2C205]
 name=Chris Koerner
+
+[https://cookiesandcodeblog.wordpress.com/feed/]
+name=Josephine Lim
diff --git a/modules/planet/templates/feeds_rawdog/en_config.erb 
b/modules/planet/templates/feeds_rawdog/en_config.erb
index 28ed88c..f064d32 100644
--- a/modules/planet/templates/feeds_rawdog/en_config.erb
+++ b/modules/planet/templates/feeds_rawdog/en_config.erb
@@ -222,3 +222,4 @@
 feed 1h https://medium.com/feed/wiki-playtime
 feed 1h https://goinggnu.wordpress.com/category/wikipedia/feed/
 feed 1h https://clkoerner.com/?feed=rss=197,205
+feed 1h https://cookiesandcodeblog.wordpress.com/feed/

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I14c2b6c7409e7e581fd762b06c7d34a24e558eca
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Amire80 
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...Html2Wiki[master]: Fix indent in json file

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: Fix indent in json file
..


Fix indent in json file

Change-Id: I584a2af7543f10def1b5b9a261b2a3b67ce9b0aa
---
M extension.json
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/extension.json b/extension.json
index 733bcdd..7fb937c 100644
--- a/extension.json
+++ b/extension.json
@@ -98,6 +98,6 @@
"manifest_version": 1,
"callback": "Html2Wiki::checkEnvironment",
"requires": {
-"MediaWiki": ">= 1.19.0"
-}
+   "MediaWiki": ">= 1.19.0"
+   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I584a2af7543f10def1b5b9a261b2a3b67ce9b0aa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Html2Wiki
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
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] mediawiki...LastUserLogin[master]: Remove unused i18n shim

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: Remove unused i18n shim
..


Remove unused i18n shim

Change-Id: I45ba469c14a772813b43dc7ea573d37c10f0351b
---
D LastUserLogin.i18n.php
1 file changed, 0 insertions(+), 35 deletions(-)

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



diff --git a/LastUserLogin.i18n.php b/LastUserLogin.i18n.php
deleted file mode 100644
index dd97706..000
--- a/LastUserLogin.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShim12f5986b2e37d5dd' ) ) {
-   function wfJsonI18nShim12f5986b2e37d5dd( $cache, $code, &$cachedData ) {
-   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
-   foreach ( $codeSequence as $csCode ) {
-   $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
-   if ( is_readable( $fileName ) ) {
-   $data = FormatJson::decode( file_get_contents( 
$fileName ), true );
-   foreach ( array_keys( $data ) as $key ) {
-   if ( $key === '' || $key[0] === '@' ) {
-   unset( $data[$key] );
-   }
-   }
-   $cachedData['messages'] = array_merge( $data, 
$cachedData['messages'] );
-   }
-
-   $cachedData['deps'][] = new FileDependency( $fileName );
-   }
-   return true;
-   }
-
-   $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShim12f5986b2e37d5dd';
-}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I45ba469c14a772813b43dc7ea573d37c10f0351b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LastUserLogin
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Cite[master]: Run stylelint also for less file

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: Run stylelint also for less file
..


Run stylelint also for less file

File was added with I6f9b85cd6cfdb055692b1f537d569c158900f7c9

Change-Id: I0ec5400422c5f8dc9f38c64dc3051a512fe20afe
---
M Gruntfile.js
M modules/ext.cite.styles.minerva.less
2 files changed, 4 insertions(+), 2 deletions(-)

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



diff --git a/Gruntfile.js b/Gruntfile.js
index 76d954c..e249f35 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -26,12 +26,14 @@
stylelint: {
all: [
'**/*.css',
+   '**/*.less',
'!node_modules/**'
]
},
jsonlint: {
all: [
'**/*.json',
+   '.stylelintrc',
'!node_modules/**'
]
}
diff --git a/modules/ext.cite.styles.minerva.less 
b/modules/ext.cite.styles.minerva.less
index 01d70ba..db63b72 100644
--- a/modules/ext.cite.styles.minerva.less
+++ b/modules/ext.cite.styles.minerva.less
@@ -1,6 +1,6 @@
-@import "mediawiki.mixins.less";
+@import 'mediawiki.mixins.less';
 
- .mw-references-columns {
+.mw-references-columns {
/* Minerva skin width is cut to 1000px  (62.5em). With margins/paddings 
included this
leaves 55.8em for content. This ensures that 2 columns will be used 
where possible */
.column-width( 25em );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0ec5400422c5f8dc9f38c64dc3051a512fe20afe
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Thanks[master]: Add missing jQueryMsg dependency for mobile diff view

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: Add missing jQueryMsg dependency for mobile diff view
..


Add missing jQueryMsg dependency for mobile diff view

Bug: T170917
Change-Id: Ibca76902e0d748b95bb57e871993a4dc2664d5cd
---
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 314b78f..5e30b49 100644
--- a/extension.json
+++ b/extension.json
@@ -102,6 +102,7 @@
],
"dependencies": [
"mediawiki.api",
+   "mediawiki.jqueryMsg",
"mediawiki.notify"
],
"targets": [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibca76902e0d748b95bb57e871993a4dc2664d5cd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Thanks
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Mooeypoo 
Gerrit-Reviewer: Phuedx 
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...NSFileRepo[master]: Avoid duplicate keys in extension.json

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: Avoid duplicate keys in extension.json
..


Avoid duplicate keys in extension.json

Change-Id: I710d66123f0684236b1a3af624309c403e314a22
---
M extension.json
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/extension.json b/extension.json
index 846989f..51c7eda 100644
--- a/extension.json
+++ b/extension.json
@@ -43,7 +43,7 @@
},
"Hooks": {
"UploadForm:BeforeProcessing": 
"NSFileRepo\\Hooks\\UploadFormBeforeProcessing::handle",
-   "@note": "Note, this must be AFTER Extension:Lockdown has been 
included - thus assuming that the user has access to files in general + files 
at this particular namespace.",
+   "@note userCan": "Note, this must be AFTER Extension:Lockdown 
has been included - thus assuming that the user has access to files in general 
+ files at this particular namespace.",
"userCan": "NSFileRepo\\Hooks\\UserCan::handle",
"BeforePageDisplay": "NSFileRepoHooks::onBeforePageDisplay",
"UploadFormInitDescriptor": 
"NSFileRepo\\Hooks\\UploadFormInitDescriptor::handle",
@@ -54,9 +54,9 @@
},
"config": {
"_prefix": "egNSFileRepo",
-   "@note": "This should probably be 3000 as recommended by 
MediaWiki. But for backwards compatibility we'll stick with this default",
+   "@note NamespaceThreshold": "This should probably be 3000 as 
recommended by MediaWiki. But for backwards compatibility we'll stick with this 
default",
"NamespaceThreshold": 100,
-   "@note": "There are some widespread extensions that create 
namespaces. E.g. SemanticMediaWiki, PageForms, Widgets, Scribunto, ...",
+   "@note NamespaceBlacklist": "There are some widespread 
extensions that create namespaces. E.g. SemanticMediaWiki, PageForms, Widgets, 
Scribunto, ...",
"NamespaceBlacklist": [ 102, 104, 106, 108, 274, 828 ],
"SkipTalk": true
},

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I710d66123f0684236b1a3af624309c403e314a22
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/NSFileRepo
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Add tracking for execute button

2017-07-18 Thread Jonas Kress (WMDE) (Code Review)

Jonas Kress (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/366123 )

Change subject: Add tracking for execute button
..

Add tracking for execute button

Change-Id: Ib94b967882c7a6c7771ee98bbb45de31b926f68e
---
M wikibase/queryService/ui/App.js
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui 
refs/changes/23/366123/1

diff --git a/wikibase/queryService/ui/App.js b/wikibase/queryService/ui/App.js
index 41a23d0..d671653 100644
--- a/wikibase/queryService/ui/App.js
+++ b/wikibase/queryService/ui/App.js
@@ -534,6 +534,7 @@
SELF.prototype._handleQuerySubmit = function( e ) {
var self = this;
 
+   this._track( 'buttonClick.execute' );
if ( !this._hasRunFirstQuery ) {
this._track( 'firstQuery' );
this._hasRunFirstQuery = true;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib94b967882c7a6c7771ee98bbb45de31b926f68e
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) 

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Increase visibility of execute button

2017-07-18 Thread Jonas Kress (WMDE) (Code Review)

Jonas Kress (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/366122 )

Change subject: Increase visibility of execute button
..

Increase visibility of execute button

Increases size of execute button by 0.5em to make it more prominent.

Change-Id: I224e14e9b05f1d10dbf558fcbf28e483d96fa3d9
---
M style.css
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui 
refs/changes/22/366122/1

diff --git a/style.css b/style.css
index 113da69..072268f 100644
--- a/style.css
+++ b/style.css
@@ -146,6 +146,10 @@
text-align: center;
 }
 
+#query-box .toolbar-bottom .fa {
+   font-size: 2em;
+}
+
 /**
Bootstrap Styles
 **/

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I224e14e9b05f1d10dbf558fcbf28e483d96fa3d9
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Exclude various elements from printed view

2017-07-18 Thread Jdlrobson (Code Review)

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

Change subject: Exclude various elements from printed view
..

Exclude various elements from printed view

This change adds the noprint class to several elements
which are not useful in the printed view.

Elements impacted:
* footer links
* Indicators
* toc toggle
* Redirect header

Bug: T169823
Change-Id: I8b37a6b00618abda7267f92e4712169b22c20b94
---
M includes/page/Article.php
M includes/skins/BaseTemplate.php
M includes/skins/Skin.php
3 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/13/366113/1

diff --git a/includes/page/Article.php b/includes/page/Article.php
index dc4096c..cdaff71 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -872,7 +872,7 @@
[ 'redirect' => 'no' ]
);
 
-   $outputPage->addSubtitle( "" .
+   $outputPage->addSubtitle( "" .
$context->msg( 'redirectedfrom' 
)->rawParams( $redir )->parse()
. "" );
 
diff --git a/includes/skins/BaseTemplate.php b/includes/skins/BaseTemplate.php
index 0b7fc2f..4d74009 100644
--- a/includes/skins/BaseTemplate.php
+++ b/includes/skins/BaseTemplate.php
@@ -687,7 +687,7 @@
$html .= Html::closeElement( 'div' );
}
if ( count( $validFooterLinks ) > 0 ) {
-   $html .= Html::openElement( 'ul', [ 'id' => 'f-list', 
'class' => 'footer-places' ] );
+   $html .= Html::openElement( 'ul', [ 'id' => 'f-list', 
'class' => 'footer-places noprint' ] );
foreach ( $validFooterLinks as $aLink ) {
$html .= Html::rawElement(
'li',
@@ -729,7 +729,7 @@
 * @since 1.25
 */
public function getIndicators() {
-   $out = "\n";
+   $out = "\n";
foreach ( $this->data['indicators'] as $id => $content ) {
$out .= Html::rawElement(
'div',
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index a8f9d0c..5a8862d 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -576,7 +576,7 @@
$showHidden = $this->getUser()->getBoolOption( 'showhiddencats' 
) ||

$this->getTitle()->getNamespace() == NS_CATEGORY;
 
-   $classes = [ 'catlinks' ];
+   $classes = [ 'catlinks', 'noprint' ];
if ( empty( $allCats['normal'] ) && !( !empty( 
$allCats['hidden'] ) && $showHidden ) ) {
$classes[] = 'catlinks-allhidden';
}

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: statistics::packages: Add libssl-dev and comments

2017-07-18 Thread Bearloga (Code Review)

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

Change subject: statistics::packages: Add libssl-dev and comments
..

statistics::packages: Add libssl-dev and comments

Bug: T152712
Change-Id: Ib6128332432aac498bdfa11923d090c4d09b27e2
---
M modules/statistics/manifests/packages.pp
1 file changed, 22 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/07/366107/1

diff --git a/modules/statistics/manifests/packages.pp 
b/modules/statistics/manifests/packages.pp
index 834f70f..ce74815 100644
--- a/modules/statistics/manifests/packages.pp
+++ b/modules/statistics/manifests/packages.pp
@@ -16,21 +16,22 @@
 'mercurial',
 'tofrodos',
 'git-review',
-'make', # halfak wants make to manage dependencies
-'libwww-perl', # For wikistats stuff
-'sqlite3', # For storing and interacting with intermediate results
-'libproj-dev', # Requested by lzia for rgdal
-'libbz2-dev', # for compiling some python libs. T84378
-'libboost-regex-dev', # Ironholds wants these
+'make',   # halfak wants make to manage dependencies
+'libwww-perl',# For wikistats stuff
+'sqlite3',# For storing and interacting with 
intermediate results
+'libproj-dev',# Requested by lzia for rgdal
+'libbz2-dev', # for compiling some python libs. T84378
+'libboost-regex-dev', # Ironholds wants these
 'libboost-system-dev',
-'libyaml-cpp0.3-dev',
+'libyaml-cpp-dev',# Latest version of uaparser 
(https://github.com/ua-parser/uap-r) supports v0.5+
 'libgoogle-glog-dev',
 'libboost-iostreams-dev',
 'libmaxminddb-dev',
-'build-essential', # Requested by halfak to install SciPy
+'build-essential',# Requested by halfak to install SciPy
 'nodejs',
 'openjdk-8-jdk',
-'pandoc'   # Requested by bearloga (Mikhail); necessary for 
using RMarkdown and performing format conversions
+'pandoc', # Requested by bearloga; necessary for using 
RMarkdown and performing format conversions
+'libssl-dev', # Requested by bearloga; necessary for an 
essential R package (openssl)
 ])
 
 
@@ -44,7 +45,7 @@
 'libgsl0-dev',
 'libgdal-dev', # Requested by lzia for rgdal
 'g++',
-'libyaml-cpp0.3v5',
+'libyaml-cpp', # Latest version of uaparser 
(https://github.com/ua-parser/uap-r) supports v0.5+
 'php-cli',
 'php-curl',
 'php-mysql',
@@ -58,16 +59,13 @@
 'libgsl0ldbl',
 'gsl-bin',
 'libgsl0-dev',
-# Requested by bearloga (Mikhail) to ensure that there is a 
compiler with C++11
+# Requested by bearloga to ensure that there is a compiler with 
C++11
 # support that can compile R package 'Boom'; see T147682 and
 # http://stackoverflow.com/a/36034866/1091835 for more info)
 'g++-4.8',
-'libgdal1-dev', # Requested by lzia for rgdal
-
-'libyaml-cpp0.3',
-# Requested by bearloga (Mikhail); see T147682 and
-# http://stackoverflow.com/a/36034866/1091835 for more info.
 'gfortran-4.8',
+'libgdal1-dev',   # Requested by lzia for rgdal
+'libyaml-cpp0.3', # Requested by Ironholds (old version of 
uaparser requires v0.3)
 'php5-cli',
 'php5-curl',
 'php5-mysql',
@@ -84,17 +82,17 @@
 'python-dateutil',
 'python-numpy',
 'python-scipy',
-'python-boto',  # Amazon S3 access (needed to get zero sms logs)
-'python-pandas',# Pivot tables processing
-'python-requests',  # Simple lib to make API calls
-'python-unidecode', # Unicode simplification - converts everything to 
latin set
-'python-ua-parser', # For parsing User Agents
-'python-matplotlib',  # For generating plots of data
+'python-boto',   # Amazon S3 access (needed to get zero sms logs)
+'python-pandas', # Pivot tables processing
+'python-requests',   # Simple lib to make API calls
+'python-unidecode',  # Unicode simplification - converts everything to 
latin set
+'python-ua-parser',  # For parsing User Agents
+'python-matplotlib', # For generating plots of data
 'python-netaddr',
 'python-virtualenv', # T84378
 # Aaron Halfaker (halfak) wants python{,3}-dev environments for module 
oursql
-'python-dev',  # T83316
-'python3-dev', # T83316
+'python-dev',# T83316
+'python3-dev',   # T83316
 'python-kafka',
 'python-pymysql',

[MediaWiki-commits] [Gerrit] mediawiki...LastUserLogin[master]: Remove unused i18n shim

2017-07-18 Thread Umherirrender (Code Review)

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

Change subject: Remove unused i18n shim
..

Remove unused i18n shim

Change-Id: I45ba469c14a772813b43dc7ea573d37c10f0351b
---
D LastUserLogin.i18n.php
1 file changed, 0 insertions(+), 35 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LastUserLogin 
refs/changes/96/366096/1

diff --git a/LastUserLogin.i18n.php b/LastUserLogin.i18n.php
deleted file mode 100644
index dd97706..000
--- a/LastUserLogin.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShim12f5986b2e37d5dd' ) ) {
-   function wfJsonI18nShim12f5986b2e37d5dd( $cache, $code, &$cachedData ) {
-   $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
-   foreach ( $codeSequence as $csCode ) {
-   $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
-   if ( is_readable( $fileName ) ) {
-   $data = FormatJson::decode( file_get_contents( 
$fileName ), true );
-   foreach ( array_keys( $data ) as $key ) {
-   if ( $key === '' || $key[0] === '@' ) {
-   unset( $data[$key] );
-   }
-   }
-   $cachedData['messages'] = array_merge( $data, 
$cachedData['messages'] );
-   }
-
-   $cachedData['deps'][] = new FileDependency( $fileName );
-   }
-   return true;
-   }
-
-   $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShim12f5986b2e37d5dd';
-}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I45ba469c14a772813b43dc7ea573d37c10f0351b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LastUserLogin
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Change timezone on nl.wikinews

2017-07-18 Thread Urbanecm (Code Review)

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

Change subject: Change timezone on nl.wikinews
..

Change timezone on nl.wikinews

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 95332d5..b96a62a 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -386,6 +386,7 @@
'nlwiki' => 'Europe/Berlin',
'nlwikimedia' => 'Europe/Berlin',
'nlwikibooks' => 'Europe/Berlin',
+   'nlwikinews' => 'Europe/Berlin', // T170985
'nlwikiquote' => 'Europe/Berlin',
'nlwikisource' => 'Europe/Berlin',
'nlwikivoyage' => 'Europe/Amsterdam', // T43992

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Change logo on nl.wikinews

2017-07-18 Thread Urbanecm (Code Review)

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

Change subject: Change logo on nl.wikinews
..

Change logo on nl.wikinews

Bug: T170984
Change-Id: Iab3b156baf98e66fb2b66ecf8da347c6d037a006
---
M static/images/project-logos/nlwikinews.png
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/static/images/project-logos/nlwikinews.png 
b/static/images/project-logos/nlwikinews.png
index ed66afe..d19b2cb 100644
--- a/static/images/project-logos/nlwikinews.png
+++ b/static/images/project-logos/nlwikinews.png
Binary files differ

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: build: Pin npm packages for CI stability

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: build: Pin npm packages for CI stability
..


build: Pin npm packages for CI stability

This makes the repo consistent with general Wikimedia practice.

Change-Id: I0021620c27e9bcfcd62b1d4fbb94b949c4b2b3ad
---
M package.json
1 file changed, 6 insertions(+), 6 deletions(-)

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



diff --git a/package.json b/package.json
index 4f10976..59d8ab9 100644
--- a/package.json
+++ b/package.json
@@ -11,14 +11,14 @@
},
"devDependencies": {
"eslint-config-wikimedia": "0.4.0",
-   "grunt": "^1.0.1",
-   "grunt-banana-checker": "^0.6.0",
-   "grunt-contrib-watch": "^1.0.0",
+   "grunt": "1.0.1",
+   "grunt-banana-checker": "0.6.0",
+   "grunt-contrib-watch": "1.0.0",
"grunt-eslint": "20.0.0",
-   "grunt-jsonlint": "^1.1.0",
-   "grunt-notify": "^0.4.5",
+   "grunt-jsonlint": "1.1.0",
+   "grunt-notify": "0.4.5",
"grunt-stylelint": "0.8.0",
-   "resource-modules": "^1.0.17",
+   "resource-modules": "1.0.17",
"stylelint": "7.8.0",
"stylelint-config-wikimedia": "0.4.1"
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0021620c27e9bcfcd62b1d4fbb94b949c4b2b3ad
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Niedzielski 
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]: Add MediaWikiInstallPingback to EL purging white-list

2017-07-18 Thread Mforns (Code Review)

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

Change subject: Add MediaWikiInstallPingback to EL purging white-list
..

Add MediaWikiInstallPingback to EL purging white-list

Bug: T170986
Change-Id: Icd03a70906026e031aeaee419629c5ba4c493590
---
M modules/role/files/mariadb/eventlogging_purging_whitelist.tsv
1 file changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/49/366049/1

diff --git a/modules/role/files/mariadb/eventlogging_purging_whitelist.tsv 
b/modules/role/files/mariadb/eventlogging_purging_whitelist.tsv
index 65f3b3e..1768d59 100644
--- a/modules/role/files/mariadb/eventlogging_purging_whitelist.tsv
+++ b/modules/role/files/mariadb/eventlogging_purging_whitelist.tsv
@@ -1007,3 +1007,13 @@
 ReadingDepth   event_skin
 ReadingDepth   event_totalLength
 ReadingDepth   event_visibleLength
+MediaWikiInstallPingback   webHost
+MediaWikiInstallPingback   wiki
+MediaWikiInstallPingback   event_MediaWiki
+MediaWikiInstallPingback   event_OS
+MediaWikiInstallPingback   event_PHP
+MediaWikiInstallPingback   event_arch
+MediaWikiInstallPingback   event_curl
+MediaWikiInstallPingback   event_database
+MediaWikiInstallPingback   event_machine
+MediaWikiInstallPingback   event_webServer

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: build: Update eslint, stylelint and other and make pass

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: build: Update eslint, stylelint and other and make pass
..


build: Update eslint, stylelint and other and make pass

Change-Id: I7a2ed722dbdbbd06ee6b27f867bd4479b0c9cc92
---
M package.json
M resources/mobile.gallery/PhotoListGateway.js
M resources/mobile.nearby/Nearby.js
M resources/mobile.notifications.filter.overlay/NotificationsFilterOverlay.js
M resources/mobile.pagelist.styles/pagelist.less
M resources/mobile.patrol.ajax/init.js
M resources/mobile.references.gateway/ReferencesHtmlScraperGateway.js
M resources/mobile.references/references.less
M resources/mobile.search.api/SearchGateway.js
M resources/mobile.startup/Page.js
M tests/qunit/mobile.search.util/test_extendSearchParams.js
11 files changed, 41 insertions(+), 39 deletions(-)

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



diff --git a/package.json b/package.json
index 7717800..4f10976 100644
--- a/package.json
+++ b/package.json
@@ -12,13 +12,14 @@
"devDependencies": {
"eslint-config-wikimedia": "0.4.0",
"grunt": "^1.0.1",
-   "grunt-banana-checker": "^0.5.0",
+   "grunt-banana-checker": "^0.6.0",
"grunt-contrib-watch": "^1.0.0",
-   "grunt-eslint": "19.0.0",
+   "grunt-eslint": "20.0.0",
"grunt-jsonlint": "^1.1.0",
"grunt-notify": "^0.4.5",
-   "grunt-stylelint": "^0.6.0",
+   "grunt-stylelint": "0.8.0",
"resource-modules": "^1.0.17",
-   "stylelint-config-wikimedia": "^0.3.0"
+   "stylelint": "7.8.0",
+   "stylelint-config-wikimedia": "0.4.1"
}
 }
diff --git a/resources/mobile.gallery/PhotoListGateway.js 
b/resources/mobile.gallery/PhotoListGateway.js
index 61572e5..9b316ed 100644
--- a/resources/mobile.gallery/PhotoListGateway.js
+++ b/resources/mobile.gallery/PhotoListGateway.js
@@ -32,7 +32,7 @@
 * @return {string} Description for file
 */
_getDescription: function ( title ) {
-   title = title.replace( /\.[^\. ]+$/, '' ); // replace 
filename suffix
+   title = title.replace( /\.[^. ]+$/, '' ); // replace 
filename suffix
// strip namespace: prefix and date suffix from 
remainder
return title.replace( /^[^:]*:/, '' )
.replace( / \d{4}-\d{1,2}-\d{1,2} 
\d{1,2}-\d{1,2}$/, '' );
diff --git a/resources/mobile.nearby/Nearby.js 
b/resources/mobile.nearby/Nearby.js
index f1ca150..70430b5 100644
--- a/resources/mobile.nearby/Nearby.js
+++ b/resources/mobile.nearby/Nearby.js
@@ -90,12 +90,13 @@
getCurrentPosition: function () {
var result = $.Deferred();
if ( browser.supportsGeoLocation() ) {
-   navigator.geolocation.getCurrentPosition( 
function ( geo ) {
-   result.resolve( {
-   latitude: geo.coords.latitude,
-   longitude: geo.coords.longitude
-   } );
-   },
+   navigator.geolocation.getCurrentPosition(
+   function ( geo ) {
+   result.resolve( {
+   latitude: 
geo.coords.latitude,
+   longitude: 
geo.coords.longitude
+   } );
+   },
function ( err ) {
// see 
https://developer.mozilla.org/en-US/docs/Web/API/PositionError
if ( err.code === 1 ) {
@@ -108,7 +109,8 @@
{
timeout: 1,
enableHighAccuracy: true
-   } );
+   }
+   );
} else {
result.reject( 'incompatible' );
}
@@ -155,12 +157,13 @@
}
 
if ( options.latitude && options.longitude ) {
-   this.nearbyApi.getPages( {
-   latitude: options.latitude,
-   longitude:

[MediaWiki-commits] [Gerrit] mediawiki...MobileApp[master]: [Test] Add README

2017-07-18 Thread Mholloway (Code Review)

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

Change subject: [Test] Add README
..

[Test] Add README

Change-Id: I451b18990a1d2564e552d2f31aeb0b2b07e600c3
---
A README.md
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/README.md b/README.md
new file mode 100644
index 000..cd6b8e2
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+An extension to support the official Wikipedia apps developed primarily by the 
Wikimedia Foundation.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I451b18990a1d2564e552d2f31aeb0b2b07e600c3
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] integration/config[master]: Rename ortiz job to remove -jessie suffix

2017-07-18 Thread jenkins-bot (Code Review)

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

Change subject: Rename ortiz job to remove -jessie suffix
..


Rename ortiz job to remove -jessie suffix

The job runs on a permanent slave for now, having a -jessie suffix would
cause the slave to be put offline.

Bug: T153856
Change-Id: I9234c1e5f797c09c492e7cd51c85cb1cf02ff699
---
M jjb/discovery.yaml
M zuul/layout.yaml
2 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/jjb/discovery.yaml b/jjb/discovery.yaml
index 962d549..f4e26f6 100644
--- a/jjb/discovery.yaml
+++ b/jjb/discovery.yaml
@@ -1,5 +1,5 @@
 - job:
-name: ortiz-test-jessie
+name: ortiz-rlang
 node: integration-r-lang-01
 triggers:
 - zuul
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 3af8597..1445afe 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -906,7 +906,7 @@
 voting: false
 
   # WIP T153856
-  - name: ^ortiz-test-jessie$
+  - name: ^ortiz-rlang$
 voting: false
 # FIXME remove noop gate-and-submit when making it voting
 
@@ -2363,7 +2363,7 @@
 
   - name: wikimedia/discovery/ortiz
 test:
-  - ortiz-test-jessie
+  - ortiz-rlang
 gate-and-submit:
   - noop
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9234c1e5f797c09c492e7cd51c85cb1cf02ff699
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Bearloga 
Gerrit-Reviewer: Hashar 
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] operations/puppet[production]: icinga/ores: Change scoring team's name for alerts; point to...

2017-07-18 Thread Dzahn (Code Review)

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

Change subject: icinga/ores: Change scoring team's name for alerts; point to 
group member
..


icinga/ores: Change scoring team's name for alerts; point to group member

DEPENDENCY: This will require a change to the private repo, to add the
"team-scoring" contact info  sending via PM...

Change-Id: I4a9a006f425e9f8ddc85269147bd3a1a9900844b
---
M modules/icinga/manifests/monitor/ores.pp
M modules/icinga/manifests/monitor/ores_labs_web_node.pp
M modules/nagios_common/files/contactgroups.cfg
3 files changed, 7 insertions(+), 7 deletions(-)

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



diff --git a/modules/icinga/manifests/monitor/ores.pp 
b/modules/icinga/manifests/monitor/ores.pp
index 57f2eba..00c9311 100644
--- a/modules/icinga/manifests/monitor/ores.pp
+++ b/modules/icinga/manifests/monitor/ores.pp
@@ -2,7 +2,7 @@
 class icinga::monitor::ores {
 
 monitoring::grafana_alert { 'db/ores':
-contact_group   => 'team-ores',
+contact_group   => 'team-scoring',
 }
 
 @monitoring::host { 'ores.wmflabs.org':
@@ -17,7 +17,7 @@
 description   => 'ORES home page',
 check_command => 'check_http',
 host  => 'ores.wmflabs.org',
-contact_group => 'team-ores',
+contact_group => 'team-scoring',
 }
 
 $web_nodes = [ 'ores-web-03', 'ores-web-05' ]
@@ -29,14 +29,14 @@
 description   => 'ORES worker labs',
 check_command => 'check_ores_workers!oresweb',
 host  => 'ores.wmflabs.org',
-contact_group => 'team-ores',
+contact_group => 'team-scoring',
 }
 
 monitoring::service { 'ores_worker_production':
 description   => 'ORES worker production',
 check_command => 'check_ores_workers!ores.wikimedia.org',
 host  => 'ores.wikimedia.org',
-contact_group => 'team-ores',
+contact_group => 'team-scoring',
 }
 
 # T122830
diff --git a/modules/icinga/manifests/monitor/ores_labs_web_node.pp 
b/modules/icinga/manifests/monitor/ores_labs_web_node.pp
index 0128511..c67d030 100644
--- a/modules/icinga/manifests/monitor/ores_labs_web_node.pp
+++ b/modules/icinga/manifests/monitor/ores_labs_web_node.pp
@@ -4,6 +4,6 @@
 description   => "ORES web node labs ${title}",
 check_command => "check_ores_workers!oresweb/node/${title}",
 host  => 'ores.wmflabs.org',
-contact_group => 'team-ores',
+contact_group => 'team-scoring',
 }
 }
diff --git a/modules/nagios_common/files/contactgroups.cfg 
b/modules/nagios_common/files/contactgroups.cfg
index abd8a0d..bbca1c8 100644
--- a/modules/nagios_common/files/contactgroups.cfg
+++ b/modules/nagios_common/files/contactgroups.cfg
@@ -60,8 +60,8 @@
 }
 
 define contactgroup {
-contactgroup_name   team-ores
-members halfak,Ladsgroup,irc-ores
+contactgroup_name   team-scoring
+members team-scoring,irc-ores
 }
 
 define contactgroup {

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

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

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

1 2 3 4 5 >

1 - 100 of 405 matches

Mail list logo