diff options
| author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2018-12-04 10:31:11 +0000 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2018-12-04 15:14:34 +0000 |
| commit | 5978b98c5f50bf0a2f9ffb14d950d9a93b14ca4b (patch) | |
| tree | e41663af7cc2c82f564acf117c8490d789aa3b5c /app/views/profiles | |
| parent | 8cd5004b350ef342f66956c11272dad1328f6526 (diff) | |
| download | gitlab-ce-5978b98c5f50bf0a2f9ffb14d950d9a93b14ca4b.tar.gz | |
Backport GroupSAML unlink changes
- Improves spacing between account buttons on Profile
- AccountsController#show uses locals instead of instance variables
- New `display_providers_on_profile?` helper method
- Adds `render_if_exists` for GroupSAMl unlink buttons
See: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8682
Diffstat (limited to 'app/views/profiles')
| -rw-r--r-- | app/views/profiles/accounts/show.html.haml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/views/profiles/accounts/show.html.haml b/app/views/profiles/accounts/show.html.haml index 2220b4eee96..fffdc305623 100644 --- a/app/views/profiles/accounts/show.html.haml +++ b/app/views/profiles/accounts/show.html.haml @@ -1,5 +1,6 @@ - page_title "Account" - @content_class = "limit-container-width" unless fluid_layout +- user = local_assigns.fetch(:user) - if current_user.ldap_user? .alert.alert-info @@ -21,7 +22,7 @@ = link_to 'Enable two-factor authentication', profile_two_factor_auth_path, class: 'btn btn-success' %hr -- if button_based_providers.any? +- if display_providers_on_profile? .row.prepend-top-default .col-lg-4.profile-settings-sidebar %h4.prepend-top-0 @@ -46,6 +47,7 @@ - else = link_to omniauth_authorize_path(:user, provider), method: :post, class: 'provider-btn not-active' do Connect + = render_if_exists 'profiles/accounts/group_saml_unlink_buttons', group_saml_identities: local_assigns[:group_saml_identities] %hr - if current_user.can_change_username? .row.prepend-top-default @@ -66,7 +68,7 @@ %h4.prepend-top-0.danger-title = s_('Profiles|Delete account') .col-lg-8 - - if @user.can_be_removed? && can?(current_user, :destroy_user, @user) + - if user.can_be_removed? && can?(current_user, :destroy_user, user) %p = s_('Profiles|Deleting an account has the following effects:') = render 'users/deletion_guidance', user: current_user @@ -79,10 +81,10 @@ confirm_with_password: ('true' if current_user.confirm_deletion_with_password?), username: current_user.username } } - else - - if @user.solo_owned_groups.present? + - if user.solo_owned_groups.present? %p = s_('Profiles|Your account is currently an owner in these groups:') - %strong= @user.solo_owned_groups.map(&:name).join(', ') + %strong= user.solo_owned_groups.map(&:name).join(', ') %p = s_('Profiles|You must transfer ownership or delete these groups before you can delete your account.') - else |