[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Test setting gallery config differently on Beta Cluster enwiki

2016-10-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Test setting gallery config differently on Beta Cluster enwiki
..


Test setting gallery config differently on Beta Cluster enwiki

Though this is configured in default settings we've never varied this before;
I chose to place it after core image config, and before 'PagedTiffHandler' is
set, in some sort of vague consistency, but this doesn't fix the overall file
order to be ideal.

Change-Id: I3d61178ce361e7a08e3f16d52aa32619fffeb43d
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
2 files changed, 19 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 268117a..117dba3 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -461,6 +461,10 @@
 $wgFileBlacklist[] = 'txt';
 $wgFileBlacklist[] = 'mht';
 
+if ( $wmgGalleryOptions ) {
+   $wgGalleryOptions = $wmgGalleryOptions;
+}
+
 if ( $wmgUsePagedTiffHandler ) {
include( $IP . '/extensions/PagedTiffHandler/PagedTiffHandler.php' );
 }
diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 151dbb0..244d3b9 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -558,5 +558,20 @@
'wmgUseQuiz' => [
'cawiki' => true,
],
+
+   // Test gallery settings; see T141349
+   'wmgGalleryOptions' => [
+   'default' => [
+   'imagesPerRow' => 0,
+   'imageWidth' => 120,
+   'imageHeight' => 120,
+   'captionLength' => true,
+   'showBytes' => true,
+   'mode' => 'traditional',
+   ],
+   '+enwiki' => [
+   'mode' => 'packed', // T141349
+   ],
+   ],
];
 } # wmflLabsSettings()

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3d61178ce361e7a08e3f16d52aa32619fffeb43d
Gerrit-PatchSet: 5
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Gilles 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Test setting gallery config differently on Beta Cluster enwiki

2016-07-26 Thread Jforrester (Code Review) 
Jforrester has uploaded a new change for review.

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

Change subject: Test setting gallery config differently on Beta Cluster enwiki
..

Test setting gallery config differently on Beta Cluster enwiki

Though this is configured in default settings we've never varied this before;
I chose to place it after core image config, and before 'PagedTiffHandler' is
set, in some sort of vague consistency, but this doesn't fix the overall file
order to be ideal.

Change-Id: I3d61178ce361e7a08e3f16d52aa32619fffeb43d
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
2 files changed, 20 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index ad7a38f..58daa86 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -463,6 +463,10 @@
 $wgFileBlacklist[] = 'txt';
 $wgFileBlacklist[] = 'mht';
 
+if ( $wmgGalleryOptions ) {
+   $wgGalleryOptions = $wmgGalleryOptions;
+}
+
 if ( $wmgUsePagedTiffHandler ) {
include( $IP . '/extensions/PagedTiffHandler/PagedTiffHandler.php' );
 }
diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 36b903f..eddc6c6 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -575,5 +575,21 @@
'tagline' => true, 'search' => true, 'nearby' 
=> true, 'watchlist' => true
]
],
+
+   // Test gallery settings
+   'wmgGalleryOptions' =[
+   'default' => [
+   'imagesPerRow' => 0,
+   'imageWidth' => 120,
+   'imageHeight' => 120,
+   'captionLength' => true,
+   'showBytes' => true,
+   'mode' => 'traditional',
+   ],
+   '+enwiki' => [
+   'mode' => 'packed', // T141349
+   ],
+   ],
+
];
 } # wmflLabsSettings()

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

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

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