Merge "Add 3D filetype for STL files"

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

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 19c585d..00e26d9 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1455,6 +1455,8 @@ $wgGalleryOptions = [
        'captionLength' => true,
        // Show the filesize in bytes in categories
        'showBytes' => true,
+       // Show the dimensions (width x height) in categories
+       'showDimensions' => true,
        'mode' => 'traditional',
 ];
 
@@ -3056,6 +3058,12 @@ $wgDisableTitleConversion = false;
  */
 $wgDefaultLanguageVariant = false;
 
+/**
+ * Whether to enable the pig latin variant of English (en-x-piglatin),
+ * used to ease variant development work.
+ */
+$wgUsePigLatinVariant = false;
+
 /**
  * Disabled variants array of language variant conversion.
  *
@@ -6765,7 +6773,13 @@ $wgUseRCPatrol = true;
 /**
  * Whether to allow users to save their RecentChanges filters
  */
-$wgStructuredChangeFiltersEnableSaving = false;
+$wgStructuredChangeFiltersEnableSaving = true;
+
+/**
+ * Whether to show the new experimental views (like namespaces, tags, and users) in
+ * RecentChanges filters
+ */
+$wgStructuredChangeFiltersEnableExperimentalViews = false;
 
 /**
  * Use new page patrolling to check new pages on Special:Newpages
@@ -8183,7 +8197,6 @@ $wgPhpCli = '/usr/bin/php';
  * @note If multiple wikis are being served from the same process (e.g. the
  *  same fastCGI or Apache server), this setting must be the same on all those
  *  wikis.
- * @see wfInitShellLocale()
  */
 $wgShellLocale = 'C.UTF-8';
 
@@ -8560,6 +8573,15 @@ $wgPopularPasswordFile = __DIR__ . '/../serialized/commonpasswords.cdb';
  */
 $wgMaxUserDBWriteDuration = false;
 
+/*
+ * Max time (in seconds) a job-generated transaction can spend in writes.
+ * If exceeded, the transaction is rolled back with an error instead of being committed.
+ *
+ * @var int|bool Disabled if false
+ * @since 1.30
+ */
+$wgMaxJobDBWriteDuration = false;
+
 /**
  * Mapping of event channels (or channel categories) to EventRelayer configuration.
  *