Give "mergehistory" to sysops

Follows-up cf8e994053af and 9b070bf461ddf1 (r27823).

Bug: 66155
Change-Id: Iaaa30afbdc834faf0fb5f68bc82c7d8aef8fcec8

diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index 3ce182e..70f6084 100644 (file)
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -32,6 +32,7 @@ production.
 * $wgCountTotalSearchHits has been removed. If you're concerned about efficiency
   of search, you should use something like CirrusSearch instead of built in
   search.
+* Users in the 'sysop' group have access to Special:MergeHistory by default.
 
 === New features in 1.24 ===
 * Added a new hook, "WhatLinksHereProps", to allow extensions to annotate

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 05c7696..51ebd57 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4397,7 +4397,7 @@ $wgGroupPermissions['sysop']['unblockself'] = true;
 $wgGroupPermissions['sysop']['suppressredirect'] = true;
 #$wgGroupPermissions['sysop']['pagelang'] = true;
 #$wgGroupPermissions['sysop']['upload_by_url'] = true;
-#$wgGroupPermissions['sysop']['mergehistory'] = true;
+$wgGroupPermissions['sysop']['mergehistory'] = true;
 
 // Permission to change users' group assignments
 $wgGroupPermissions['bureaucrat']['userrights'] = true;