jenkins-bot has submitted this change and it was merged.

Change subject: Remove old UserMerge special page class alias
......................................................................


Remove old UserMerge special page class alias

Change-Id: Ie9e1231ea4f73a94d14f7c588befcbd4060205d7
---
M SpecialUserMerge.php
M extension.json
2 files changed, 0 insertions(+), 8 deletions(-)

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



diff --git a/SpecialUserMerge.php b/SpecialUserMerge.php
index 9180b73..bdf7d5b 100644
--- a/SpecialUserMerge.php
+++ b/SpecialUserMerge.php
@@ -174,10 +174,3 @@
                return 'users';
        }
 }
-
-/**
- * Former class name, for backwards compatability
- * @deprecated
- */
-class UserMerge extends SpecialUserMerge {
-}
diff --git a/extension.json b/extension.json
index e0a3364..7d77f4b 100644
--- a/extension.json
+++ b/extension.json
@@ -39,7 +39,6 @@
        },
        "AutoloadClasses": {
                "SpecialUserMerge": "SpecialUserMerge.php",
-               "UserMerge": "SpecialUserMerge.php",
                "MergeUser": "MergeUser.php",
                "IUserMergeLogger": "IUserMergeLogger.php",
                "UserMergeLogger": "UserMergeLogger.php"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9e1231ea4f73a94d14f7c588befcbd4060205d7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UserMerge
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to