Merge "mw.Upload.BookletLayout: Require non-whitespace description"

[lhc/web/wiklou.git] / includes / DefaultSettings.php

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index bf85678..54216fd 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -535,6 +535,12 @@ $wgUseInstantCommons = false;
  */
 $wgForeignUploadTargets = array();
 
+/**
+ * Cross-wiki upload A/B test configuration.
+ */
+$wgForeignUploadTestEnabled = false;
+$wgForeignUploadTestDefault = 1;
+
 /**
  * File backend structure configuration.
  *
@@ -1493,7 +1499,7 @@ $wgPasswordSenderName = 'MediaWiki Mail';
  * It might be necessary to adapt the address or to set it equal
  * to the $wgEmergencyContact address.
  */
-$wgNoReplyAddress = 'reply@not.possible';
+$wgNoReplyAddress = 'reply@not.possible.invalid';
 
 /**
  * Set to true to enable the e-mail basic features:
@@ -4748,6 +4754,12 @@ $wgWhitelistReadRegexp = false;
  */
 $wgEmailConfirmToEdit = false;
 
+/**
+ * Should MediaWiki attempt to protect user's privacy when doing redirects?
+ * Keep this true if access counts to articles are made public.
+ */
+$wgHideIdentifiableRedirects = true;
+
 /**
  * Permission keys given to users in each group.
  *
@@ -5521,12 +5533,15 @@ $wgDebugDumpSql = false;
  * @since 1.26
  */
 $wgTrxProfilerLimits = array(
-       // Basic GET and POST requests
+       // HTTP GET/HEAD requests.
+       // Master queries should not happen on GET requests
        'GET' => array(
                'masterConns' => 0,
                'writes' => 0,
                'readQueryTime' => 5
        ),
+       // HTTP POST requests.
+       // Master reads and writes will happen for a subset of these.
        'POST' => array(
                'readQueryTime' => 5,
                'writeQueryTime' => 1,
@@ -5707,15 +5722,13 @@ $wgProfileOnly = false;
 $wgStatsdServer = false;
 
 /**
- * Prefix for metric names sent to wgStatsdServer.
- *
- * Defaults to "MediaWiki".
+ * Prefix for metric names sent to $wgStatsdServer.
  *
  * @see RequestContext::getStats
  * @see BufferingStatsdDataFactory
  * @since 1.25
  */
-$wgStatsdMetricPrefix = false;
+$wgStatsdMetricPrefix = 'MediaWiki';
 
 /**
  * InfoAction retrieves a list of transclusion links (both to and from).