[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Try fixing ACW setup

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

Change subject: Try fixing ACW setup
..


Try fixing ACW setup

* Remove superfuluous wfLoadExtension() from CS-labs.php
* Move config to IS-labs.php

Change-Id: I5131eb0b1cf3b074f8881308bff8fcfa66104adc
---
M wmf-config/CommonSettings-labs.php
M wmf-config/InitialiseSettings-labs.php
2 files changed, 11 insertions(+), 8 deletions(-)

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



diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 58abd0d..6feaf4d 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -336,13 +336,6 @@
$wgLoginNotifyAttemptsNewIP = 1;
 }
 
-if ( $wmgUseArticleCreationWorkflow ) {
-   wfLoadExtension( 'ArticleCreationWorkflow' );
-   $wgArticleCreationWorkflows = [
-   [ 'namespaces' => [ 0 ], 'excludeRight' => 'autoconfirmed' ]
-   ]; // NS_MAIN is namespace 0
-}
-
 $wgStructuredChangeFiltersEnableExperimentalViews = true;
 $wgStructuredChangeFiltersEnableLiveUpdate = true;
 
diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 6923927..93c601d 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -471,7 +471,17 @@
],
 
'wmgUseArticleCreationWorkflow' => [
-   'default' => true,
+   'default' => false,
+   'enwiki' => true,
+   ],
+
+   'wgArticleCreationWorkflows' => [
+   'default' => [
+   [
+   'namespaces' => [ 0 ],
+   'excludeRight' => 'autoconfirmed'
+   ],
+   ],
],
 
// Ensure ?action=credits isn't break and allow to work

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5131eb0b1cf3b074f8881308bff8fcfa66104adc
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: MaxSem 
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] operations/mediawiki-config[master]: Try fixing ACW setup

2017-09-06 Thread MaxSem (Code Review) 
MaxSem has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/376443 )

Change subject: Try fixing ACW setup
..

Try fixing ACW setup

* Remove superfuluous wfLoadExtension() from CS-labs.php
* Move config to IS-labs.php

Change-Id: I5131eb0b1cf3b074f8881308bff8fcfa66104adc
---
M wmf-config/CommonSettings-labs.php
M wmf-config/InitialiseSettings-labs.php
2 files changed, 11 insertions(+), 8 deletions(-)


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

diff --git a/wmf-config/CommonSettings-labs.php 
b/wmf-config/CommonSettings-labs.php
index 58abd0d..6feaf4d 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -336,13 +336,6 @@
$wgLoginNotifyAttemptsNewIP = 1;
 }
 
-if ( $wmgUseArticleCreationWorkflow ) {
-   wfLoadExtension( 'ArticleCreationWorkflow' );
-   $wgArticleCreationWorkflows = [
-   [ 'namespaces' => [ 0 ], 'excludeRight' => 'autoconfirmed' ]
-   ]; // NS_MAIN is namespace 0
-}
-
 $wgStructuredChangeFiltersEnableExperimentalViews = true;
 $wgStructuredChangeFiltersEnableLiveUpdate = true;
 
diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 6923927..147dfeb 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -471,9 +471,19 @@
],
 
'wmgUseArticleCreationWorkflow' => [
-   'default' => true,
+   'default' => false,
+   'enwiki' => true,
],
 
+   'wgArticleCreationWorkflows' => [
+   'default' => [
+   [
+   'namespaces' => [ 0 ],
+   'excludeRight' => 'autoconfirmed'
+   ],
+   ],
+   ]
+
// Ensure ?action=credits isn't break and allow to work
// to cache this information. See T130820.
'wgMaxCredits' => [

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

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

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