add confirmation dialog and fix merge logic

Fork: 0

opidor / dmpopidor

Browse code add confirmation dialog and fix merge logic dev
1 parent e91afdc commit 634234a033368e522b02380e482cfa632afa48d0 Sam Rust authored on 4 Sep 2019

Patch

Unified Split

Showing 6 changed files

Ignore Space Show notes View app/controllers/super_admin/users_controller.rb

Ignore Space Show notes View app/javascript/views/super_admin/users/edit.js

Ignore Space Show notes View app/models/user.rb

Ignore Space Show notes View app/views/super_admin/users/_confirm_merge.html.erb

Ignore Space Show notes View app/views/super_admin/users/edit.html.erb

Ignore Space Show notes View lib/unique_random.rb 0 → 100644

Show line notes below