GRN2-260: Added the ability to merge user accounts (#938)

* Added the ability to merge user accounts * Styling fixes
2020-02-14 10:24:06 -05:00
parent 31258272c2
commit 005c738e4d
13 changed files with 222 additions and 5 deletions
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@ -36,7 +36,7 @@ class Ability

      if highest_role.get_permission("can_manage_users")
        can [:index, :roles, :edit_user, :promote, :demote, :ban_user, :unban_user,
-             :approve, :invite, :reset, :undelete], :admin
+             :approve, :invite, :reset, :undelete, :merge_user], :admin
      end

      can [:index, :server_recordings, :server_rooms], :admin if highest_role.get_permission("can_manage_rooms_recordings")