Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

4 files changed, 3 insertions, 22 deletions

diff --git a/app/views/profiles/chat_names/index.html.haml b/app/views/profiles/chat_names/index.html.haml
index e0b0f839455..782850afcda 100644
--- a/app/views/profiles/chat_names/index.html.haml
+++ b/app/views/profiles/chat_names/index.html.haml
@@ -9,7 +9,7 @@
       = _('You can see your chat accounts.')
 
   .col-lg-8
-    %h5 Active chat names (#{@chat_names.size})
+    %h5.gl-mt-0 Active chat names (#{@chat_names.size})
 
     - if @chat_names.present?
       .table-responsive
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index bf9f1336a4f..41699d6f01f 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -70,7 +70,7 @@
           prepend: emoji_button,
           append: reset_message_button,
           placeholder: s_("Profiles|What's your status?")
-        - if Feature.enabled?(:set_user_availability_status, @user)
+        - if Feature.enabled?(:set_user_availability_status, @user, default_enabled: :yaml)
           .checkbox-icon-inline-wrapper
             = status_form.check_box :availability, { data: { testid: "user-availability-checkbox" }, label: s_("Profiles|Busy"), wrapper_class: 'gl-mr-0 gl-font-weight-bold' }, availability["busy"], availability["not_set"]
             .gl-text-gray-600.gl-ml-5= s_('Profiles|"Busy" will be shown next to your name')
diff --git a/app/views/profiles/two_factor_auths/_codes.html.haml b/app/views/profiles/two_factor_auths/_codes.html.haml
index 178a9d3f8b4..9f850842f58 100644
--- a/app/views/profiles/two_factor_auths/_codes.html.haml
+++ b/app/views/profiles/two_factor_auths/_codes.html.haml
@@ -1,18 +1,3 @@
 - show_success_alert = local_assigns.fetch(:show_success_alert, nil)
 
-- if Feature.enabled?(:vue_2fa_recovery_codes, current_user, default_enabled: true)
-  .js-2fa-recovery-codes{ data: { codes: @codes.to_json, profile_account_path: profile_account_path(two_factor_auth_enabled_successfully: show_success_alert) } }
-- else
-  %p.slead
-    - lose_2fa_message =  _('Should you ever lose your phone or access to your one time password secret, each of these recovery codes can be used one time each to regain access to your account. Please save them in a safe place, or you %{b_start}will%{b_end} lose access to your account.') % { b_start:'<b>', b_end:'</b>' }
-    = lose_2fa_message.html_safe
-
-  .codes.card{ data: { qa_selector: 'codes_content' } }
-    %ul
-      - @codes.each do |code|
-        %li
-          %span.monospace{ data: { qa_selector: 'code_content' } }= code
-
-  .d-flex
-    = link_to _('Proceed'), profile_account_path, class: 'gl-button btn btn-success gl-mr-3', data: { qa_selector: 'proceed_button' }
-    = link_to _('Download codes'), "data:text/plain;charset=utf-8,#{CGI.escape(@codes.join("\n"))}", download: "gitlab-recovery-codes.txt", class: 'gl-button btn btn-default'
+.js-2fa-recovery-codes{ data: { codes: @codes.to_json, profile_account_path: profile_account_path(two_factor_auth_enabled_successfully: show_success_alert) } }
diff --git a/app/views/profiles/two_factor_auths/create.html.haml b/app/views/profiles/two_factor_auths/create.html.haml
index be4800024cf..606dda5ed55 100644
--- a/app/views/profiles/two_factor_auths/create.html.haml
+++ b/app/views/profiles/two_factor_auths/create.html.haml
@@ -1,8 +1,4 @@
 - page_title _('Two-factor Authentication'), _('Account')
 - add_page_specific_style 'page_bundles/profile_two_factor_auth'
 
-- unless Feature.enabled?(:vue_2fa_recovery_codes, current_user, default_enabled: true)
-  .gl-alert.gl-alert-success.gl-mb-5
-    = _('Congratulations! You have enabled Two-factor Authentication!')
-
 = render 'codes', show_success_alert: true