diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-02 03:09:38 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-02 03:09:38 +0000 |
commit | 408af4d5cf3a3893f8431d4d28821c766ab92bec (patch) | |
tree | 481b4b471e09a2de078e5aae3982a53a2a51bb97 /app/helpers/users_helper.rb | |
parent | f3506a4deee10c8b0e3c57ed2019d1df9c521258 (diff) | |
download | gitlab-ce-408af4d5cf3a3893f8431d4d28821c766ab92bec.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/users_helper.rb')
-rw-r--r-- | app/helpers/users_helper.rb | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index d126981fb27..6679b6224ed 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -129,7 +129,7 @@ module UsersHelper } end - def unblock_user_modal_data(user) + def user_unblock_data(user) { path: unblock_admin_user_path(user), method: 'put', @@ -168,6 +168,19 @@ module UsersHelper } end + def user_activation_data(user) + { + path: activate_admin_user_path(user), + method: 'put', + modal_attributes: { + title: s_('AdminUsers|Activate user %{username}?') % { username: sanitize_name(user.name) }, + message: s_('AdminUsers|You can always deactivate their account again if needed.'), + okVariant: 'info', + okTitle: s_('AdminUsers|Activate') + }.to_json + } + end + def user_deactivation_effects header = tag.p s_('AdminUsers|Deactivating a user has the following effects:') |