diff options
| author | azul <azul@riseup.net> | 2017-11-13 04:44:41 -0800 |
|---|---|---|
| committer | azul <azul@riseup.net> | 2017-11-13 04:44:41 -0800 |
| commit | f250a11b4fd98bb9f4ef50c501b72f5ae2a97d1d (patch) | |
| tree | e73c759f133da8bddd68ed8bd8168b1919f67989 /app/views/users/_edit.html.haml | |
| parent | a20a1c1671d3833c7f26b678f3e476b26126c8ca (diff) | |
| parent | 028376fe1ea7638f0119ba9614629f66453d206f (diff) | |
Merge branch 'fix/8796-alternate-email' into 'master'
fix: alternate email dialogue
Closes #8796
See merge request leap/webapp!53
Diffstat (limited to 'app/views/users/_edit.html.haml')
| -rw-r--r-- | app/views/users/_edit.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/users/_edit.html.haml b/app/views/users/_edit.html.haml index 1d2b68a..8662979 100644 --- a/app/views/users/_edit.html.haml +++ b/app/views/users/_edit.html.haml @@ -2,12 +2,13 @@ -# edit user form, used by both show and edit actions. -# -# We render a bunch of forms here. Which we use depends upon config settings --# user_actions and admin_actions. They both include an array of actions +-# user_actions and admin_actions. They both include an array of actions -# allowed to users and admins. -# Possible forms are: -# 'change_password' -# 'change_pgp_key' -# 'change_service_level' +-# 'contact_email' -# 'destroy_account' - actions = APP_CONFIG[admin? ? :admin_actions : :user_actions] || [] - actions.each do |action| |