Merge pull request #2224 from DigitalCurationCentre/feature/remove_users
Allow Super admins to Archive and Merge users
dev
commit d1138c286860df14c3c40efe8283beff7cdb5e67
2 parents e6ce33e + 882bc9a
@Brian Riley Brian Riley authored on 4 Sep 2019
GitHub committed on 4 Sep 2019
Showing 8 changed files
View
app/controllers/super_admin/users_controller.rb
View
app/javascript/views/super_admin/users/edit.js
View
app/models/user.rb
View
app/policies/user_policy.rb
View
app/views/super_admin/users/_confirm_merge.html.erb 0 → 100644
View
app/views/super_admin/users/edit.html.erb
View
config/routes.rb
View
lib/unique_random.rb 0 → 100644