jenkins-bot has submitted this change and it was merged.
Change subject: Remove CodeReview-specific config file, collapse into
CommonSettings.php
......................................................................
Remove CodeReview-specific config file, collapse into CommonSettings.php
Change-Id: Ic4fd5f10c60ef76babf651cd611092d8650ce5cb
---
D docroot/noc/conf/codereview.php.txt
M docroot/noc/createTxtFileSymlinks.sh
M wmf-config/CommonSettings.php
D wmf-config/codereview.php
4 files changed, 6 insertions(+), 19 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docroot/noc/conf/codereview.php.txt
b/docroot/noc/conf/codereview.php.txt
deleted file mode 120000
index 45c0760..0000000
--- a/docroot/noc/conf/codereview.php.txt
+++ /dev/null
@@ -1 +0,0 @@
-../../../wmf-config/codereview.php
\ No newline at end of file
diff --git a/docroot/noc/createTxtFileSymlinks.sh
b/docroot/noc/createTxtFileSymlinks.sh
index 527294c..6cd1ebc 100755
--- a/docroot/noc/createTxtFileSymlinks.sh
+++ b/docroot/noc/createTxtFileSymlinks.sh
@@ -14,7 +14,6 @@
wmf-config/PoolCounterSettings-pmtpa.php
wmf-config/StartProfiler.php
wmf-config/abusefilter.php
- wmf-config/codereview.php
wmf-config/CirrusSearch-common.php
wmf-config/CirrusSearch-labs.php
wmf-config/db-eqiad.php
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index c7b81f1..0fe60cc 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1541,7 +1541,7 @@
if ( $wmgUseCodeReview ) {
include "$IP/extensions/CodeReview/CodeReview.php";
- include( "$wmfConfigDir/codereview.php" );
+
$wgSubversionProxy = 'http://codereview-proxy.wikimedia.org/index.php';
$wgGroupPermissions['user']['codereview-add-tag'] = false;
@@ -1569,6 +1569,11 @@
$wgCodeReviewRepoStatsCacheTime = 24 * 60 * 60;
$wgCodeReviewMaxDiffPaths = 100;
+
+ $importantPaths = array( '/trunk/phase3' );
+
+ $wgCodeReviewFixmePerPath['MediaWiki'] = $importantPaths;
+ $wgCodeReviewNewPerPath['MediaWiki'] = $importantPaths;
}
if ( $wmgUseAbuseFilter ) {
diff --git a/wmf-config/codereview.php b/wmf-config/codereview.php
deleted file mode 100644
index 8605b0c..0000000
--- a/wmf-config/codereview.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-# WARNING: This file is publically viewable on the web. Do not put private
data here.
-
-# This file is referenced from CommonSettings.php and included
-# when $wmgUseCodeReview is true
-# Implemented following bug 23494
-
-//$wgCodeReviewDeferredPaths['MediaWiki'] = array();
-
-$importantPaths = array(
- '/trunk/phase3',
-);
-
-$wgCodeReviewFixmePerPath['MediaWiki'] = $importantPaths;
-$wgCodeReviewNewPerPath['MediaWiki'] = $importantPaths;
--
To view, visit https://gerrit.wikimedia.org/r/92605
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4fd5f10c60ef76babf651cd611092d8650ce5cb
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
