Merge pull request #860 from DigitalCurationCentre/issue811
Issue 811
dev
commit e100b7f66b3ab6203500dd0568010d9ba62050c6
2 parents 144e6b6 + f93521b
@Brian Riley Brian Riley authored on 27 Nov 2017
GitHub committed on 27 Nov 2017
Showing 13 changed files
View
app/controllers/roles_controller.rb
View
app/controllers/users_controller.rb
View
app/helpers/mailer_helper.rb
View
app/helpers/perms_helper.rb 0 → 100644
View
app/mailers/user_mailer.rb
View
app/models/perm.rb
View
app/models/user.rb
View
app/views/user_mailer/admin_privileges.html.erb 0 → 100644
View
app/views/user_mailer/plan_access_removed.html.erb 0 → 100644
View
app/views/user_mailer/project_access_removed_notification.html.erb 100644 → 0
View
app/views/users/admin_grant_permissions.html.erb
View
test/helpers/mailer_helper_test.rb 0 → 100644
View
test/mailers/previews/user_mailer_preview.rb