diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-01-05 16:12:23 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-01-05 16:12:23 +0300 |
| commit | 47e5a7f8e3c3a16bb8803f5156a65febf614f467 (patch) | |
| tree | b0a5f7d8f596750503feac86eaa76b4883202337 /app/views/profiles | |
| parent | 396e7647f836c0cb87d19252fb6d31e91e0dbd6c (diff) | |
| parent | 2c47f0924fc5534035905746046ab0f5e9c99f23 (diff) | |
Merge branch 'winh-modal-target-id' into 'master'
Add id to modal.vue to support data-toggle="modal"
Closes #41584
See merge request gitlab-org/gitlab-ce!16189
Diffstat (limited to 'app/views/profiles')
| -rw-r--r-- | app/views/profiles/accounts/show.html.haml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/views/profiles/accounts/show.html.haml b/app/views/profiles/accounts/show.html.haml index f1313b79589..79e197ad08b 100644 --- a/app/views/profiles/accounts/show.html.haml +++ b/app/views/profiles/accounts/show.html.haml @@ -84,11 +84,13 @@ = s_('Profiles|Deleting an account has the following effects:') = render 'users/deletion_guidance', user: current_user + %button#delete-account-button.btn.btn-danger.disabled{ data: { toggle: 'modal', + target: '#delete-account-modal' } } + = s_('Profiles|Delete account') + #delete-account-modal{ data: { action_url: user_registration_path, confirm_with_password: ('true' if current_user.confirm_deletion_with_password?), username: current_user.username } } - %button.btn.btn-danger.disabled - = s_('Profiles|Delete account') - else - if @user.solo_owned_groups.present? %p |