[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Move WB client "disabledUsageAspects" setting into $wmgWikib...

2017-10-11 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/383439 )

Change subject: Move WB client "disabledUsageAspects" setting into 
$wmgWikibaseDisabledUsageAspects
..


Move WB client "disabledUsageAspects" setting into 
$wmgWikibaseDisabledUsageAspects

Just nicer than doing it all per hand.

Bug: T151717
Change-Id: Iaff80461990542ef80e8483659e80d2f9c354aa1
---
M wmf-config/InitialiseSettings.php
M wmf-config/Wikibase-production.php
2 files changed, 9 insertions(+), 6 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index b8e7692..47e18da 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17996,6 +17996,14 @@
],
 ],
 
+// T151717 and T177153
+'wmgWikibaseDisabledUsageAspects' => [
+   'default' => [ 'D', 'C' ],
+   'elwiki' => [ 'D' ],
+   'kowiki' => [ 'D' ],
+   'trwiki' => [ 'D' ],
+],
+
 'wmgUseWikibaseQuality' => [
'default' => false,
'wikidata' => true,
diff --git a/wmf-config/Wikibase-production.php 
b/wmf-config/Wikibase-production.php
index 7f700b0..8549c8d 100644
--- a/wmf-config/Wikibase-production.php
+++ b/wmf-config/Wikibase-production.php
@@ -197,12 +197,7 @@
$wgWBClientSettings['sendEchoNotification'] = true;
$wgWBClientSettings['echoIcon'] = [ 'url' => 
'/static/images/wikibase/echoIcon.svg' ];
 
-   // T177153
-   $wgWBClientSettings['disabledUsageAspects'] = [ 'D' ];
-   // T151717
-   if ( !in_array( $wgDBname, [ 'elwiki', 'kowiki', 'trwiki' ] ) ) {
-   $wgWBClientSettings['disabledUsageAspects'][] = 'C';
-   }
+   $wgWBClientSettings['disabledUsageAspects'] = 
$wmgWikibaseDisabledUsageAspects;
 
// T171027
if ( in_array( $wgDBname, [ 'commonswiki', 'ruwiki' ] ) ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaff80461990542ef80e8483659e80d2f9c354aa1
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hoo man 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Move WB client "disabledUsageAspects" setting into $wmgWikib...

2017-10-10 Thread Hoo man (Code Review) 
Hoo man has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/383439 )

Change subject: Move WB client "disabledUsageAspects" setting into 
$wmgWikibaseDisabledUsageAspects
..

Move WB client "disabledUsageAspects" setting into 
$wmgWikibaseDisabledUsageAspects

Just nicer than doing it all per hand.

Bug: T151717
Change-Id: Iaff80461990542ef80e8483659e80d2f9c354aa1
---
M wmf-config/InitialiseSettings.php
M wmf-config/Wikibase-production.php
2 files changed, 9 insertions(+), 6 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index b8e7692..db5828f 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -19612,6 +19612,14 @@
'default' => [ 'DISPLAY' => ':99' ],
 ],
 
+// T151717 and T177153
+'wmgWikibaseDisabledUsageAspects' => [
+   'default' => [ 'D', 'C' ],
+   'elwiki' => [ 'D' ],
+   'kowiki' => [ 'D' ],
+   'trwiki' => [ 'D' ],
+],
+
 ];
 
 ### WMF Labs override #
diff --git a/wmf-config/Wikibase-production.php 
b/wmf-config/Wikibase-production.php
index 7f700b0..8549c8d 100644
--- a/wmf-config/Wikibase-production.php
+++ b/wmf-config/Wikibase-production.php
@@ -197,12 +197,7 @@
$wgWBClientSettings['sendEchoNotification'] = true;
$wgWBClientSettings['echoIcon'] = [ 'url' => 
'/static/images/wikibase/echoIcon.svg' ];
 
-   // T177153
-   $wgWBClientSettings['disabledUsageAspects'] = [ 'D' ];
-   // T151717
-   if ( !in_array( $wgDBname, [ 'elwiki', 'kowiki', 'trwiki' ] ) ) {
-   $wgWBClientSettings['disabledUsageAspects'][] = 'C';
-   }
+   $wgWBClientSettings['disabledUsageAspects'] = 
$wmgWikibaseDisabledUsageAspects;
 
// T171027
if ( in_array( $wgDBname, [ 'commonswiki', 'ruwiki' ] ) ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaff80461990542ef80e8483659e80d2f9c354aa1
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hoo man 

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