diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
| commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
| tree | 544930fb309b30317ae9797a9683768705d664c4 /app/views/admin/users/_modals.html.haml | |
| parent | 4b1de649d0168371549608993deac953eb692019 (diff) | |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'app/views/admin/users/_modals.html.haml')
| -rw-r--r-- | app/views/admin/users/_modals.html.haml | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/app/views/admin/users/_modals.html.haml b/app/views/admin/users/_modals.html.haml index e56bbd06575..f6e7cefafe7 100644 --- a/app/views/admin/users/_modals.html.haml +++ b/app/views/admin/users/_modals.html.haml @@ -1,10 +1,5 @@ -#user-modal -#modal-texts.hidden{ "hidden": true, "aria-hidden": true } - %div{ data: { modal: "deactivate", - title: s_("AdminUsers|Deactivate User %{username}?"), - action: s_("AdminUsers|Deactivate") } } - = render partial: 'admin/users/user_deactivation_effects' - +#js-delete-user-modal +#js-modal-texts.hidden{ "hidden": true, "aria-hidden": true } %div{ data: { modal: "delete", title: s_("AdminUsers|Delete User %{username}?"), action: s_('AdminUsers|Delete user'), |