Add latest changes from gitlab-org/gitlab@master

1 files changed, 18 insertions, 23 deletions

diff --git a/app/views/profiles/accounts/show.html.haml b/app/views/profiles/accounts/show.html.haml
index a29a0d1b668..09b6117969c 100644
--- a/app/views/profiles/accounts/show.html.haml
+++ b/app/views/profiles/accounts/show.html.haml
@@ -15,11 +15,10 @@
       = html_escape(_('You have set up 2FA for your account! If you lose access to your 2FA device, you can use your recovery codes to access your account. Alternatively, if you upload an SSH key, you can %{anchorOpen}use that key to generate additional recovery codes%{anchorClose}.')) % { anchorOpen: '<a href="%{href}">'.html_safe % { href: help_page_path('user/profile/account/two_factor_authentication', anchor: 'generate-new-recovery-codes-using-ssh') }, anchorClose: '</a>'.html_safe }
 
 .js-search-settings-section.gl-pb-6
-  .profile-settings-sidebar
-    %h4.gl-my-0
-      = s_('Profiles|Two-factor authentication')
-    %p.gl-text-secondary
-      = s_("Profiles|Increase your account's security by enabling two-factor authentication (2FA).")
+  %h4.gl-my-0
+    = s_('Profiles|Two-factor authentication')
+  %p.gl-text-secondary
+    = s_("Profiles|Increase your account's security by enabling two-factor authentication (2FA).")
   %div
     %p
       %span.gl-font-weight-bold
@@ -34,37 +33,33 @@
 
 - if display_providers_on_profile?
   .js-search-settings-section.gl-border-t.gl-py-6
-    .profile-settings-sidebar
-      %h4.gl-my-0
-        = s_('Profiles|Service sign-in')
-      %p.gl-text-secondary
-        = s_('Profiles|Connect a service for sign-in.')
+    %h4.gl-my-0
+      = s_('Profiles|Service sign-in')
+    %p.gl-text-secondary
+      = s_('Profiles|Connect a service for sign-in.')
     = render 'providers', providers: button_based_providers, group_saml_identities: local_assigns[:group_saml_identities]
 
 - if current_user.can_change_username?
   .js-search-settings-section.gl-border-t.gl-py-6
-    .profile-settings-sidebar
-      %h4.gl-my-0.warning-title
-        = s_('Profiles|Change username')
-      %p.gl-text-secondary
-        = s_('Profiles|Changing your username can have unintended side effects.')
-        = succeed '.' do
-          = link_to _('Learn more'), help_page_path('user/profile/index', anchor: 'change-your-username'), target: '_blank', rel: 'noopener noreferrer'
+    %h4.gl-my-0.warning-title
+      = s_('Profiles|Change username')
+    %p.gl-text-secondary
+      = s_('Profiles|Changing your username can have unintended side effects.')
+      = succeed '.' do
+        = link_to _('Learn more'), help_page_path('user/profile/index', anchor: 'change-your-username'), target: '_blank', rel: 'noopener noreferrer'
     - data = { initial_username: current_user.username, root_url: root_url, action_url: update_username_profile_path(format: :json) }
     #update-username{ data: data }
 
 - if prevent_delete_account?
   .js-search-settings-section.gl-border-t.gl-py-6
-    .profile-settings-sidebar
-      %h4.gl-my-0.danger-title
-        = s_('Profiles|Delete account')
+    %h4.gl-my-0.danger-title
+      = s_('Profiles|Delete account')
     %p.gl-text-secondary
       = s_('Profiles|Account deletion is not allowed by your administrator.')
 - else
   .js-search-settings-section.gl-border-t.gl-py-6
-    .profile-settings-sidebar
-      %h4.gl-mt-0.danger-title
-        = s_('Profiles|Delete account')
+    %h4.gl-mt-0.danger-title
+      = s_('Profiles|Delete account')
     - if current_user.can_be_removed? && can?(current_user, :destroy_user, current_user)
       %p.gl-text-secondary
         = s_('Profiles|Deleting an account has the following effects:')