UX: display 'merge' button in all non-staff user profiles.

2020-04-22 17:42:09 +05:30
parent c8fed90e4e
commit e5c44f6dcf
4 changed files with 15 additions and 3 deletions
@@ -476,7 +476,7 @@ class Admin::UsersController < Admin::AdminController
    target_username = params.require(:target_username)
    target_user = User.find_by_username(target_username)

-    guardian.ensure_can_merge_user!(@user, target_user)
+    guardian.ensure_can_merge_users!(@user, target_user)

    if user = UserMerger.new(@user, target_user, current_user).merge!
      render json: success_json.merge(merged: true, user: user)