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

1 files changed, 4 insertions, 2 deletions

diff --git a/spec/views/errors/omniauth_error.html.haml_spec.rb b/spec/views/errors/omniauth_error.html.haml_spec.rb
index e99cb536bd8..487dd9f066f 100644
--- a/spec/views/errors/omniauth_error.html.haml_spec.rb
+++ b/spec/views/errors/omniauth_error.html.haml_spec.rb
@@ -15,8 +15,10 @@ RSpec.describe 'errors/omniauth_error' do
     render
 
     expect(rendered).to have_content(provider)
-    expect(rendered).to have_content(_('Sign-in failed because %{error}.') % { error: error })
+    expect(rendered).to have_content(error)
     expect(rendered).to have_link('Sign in')
-    expect(rendered).to have_content(_('If none of the options work, try contacting a GitLab administrator.'))
+    expect(rendered).to have_content(
+      _('If you are unable to sign in or recover your password, contact a GitLab administrator.')
+    )
   end
 end