Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 12 insertions, 14 deletions

diff --git a/app/views/errors/omniauth_error.html.haml b/app/views/errors/omniauth_error.html.haml
index 3090c823677..c48e12561a7 100644
--- a/app/views/errors/omniauth_error.html.haml
+++ b/app/views/errors/omniauth_error.html.haml
@@ -2,18 +2,16 @@
 
 .container
   = render partial: "shared/errors/graphic_422", formats: :svg
-  %h3
+  %h2
     = _('Sign-in using %{provider} auth failed') % { provider: @provider }
-
-  %p.light.subtitle
-    = _('Sign-in failed because %{error}.') % { error: @error }
-
-  %p
-    = _('Try logging in using your username or email. If you have forgotten your password, try recovering it')
-
-  = link_to _('Sign in'), new_session_path(:user), class: 'gl-button btn primary'
-  = link_to _('Recover password'), new_password_path(:user), class: 'gl-button btn secondary'
-
-  %hr
-  %p.light
-    = _('If none of the options work, try contacting a GitLab administrator.')
+  .gl-mb-5
+    = @error
+  .gl-mb-5
+    = render Pajamas::ButtonComponent.new(variant: :confirm,
+      href: new_session_path(:user),
+      button_options: { class: 'gl-mr-2' }) do
+      = _('Sign in')
+    = render Pajamas::ButtonComponent.new(href: new_password_path(:user)) do
+      = _('Recover password')
+  %div
+    = _('If you are unable to sign in or recover your password, contact a GitLab administrator.')