diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 15:40:28 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 15:40:28 +0000 |
| commit | b595cb0c1dec83de5bdee18284abe86614bed33b (patch) | |
| tree | 8c3d4540f193c5ff98019352f554e921b3a41a72 /app/views/errors | |
| parent | 2f9104a328fc8a4bddeaa4627b595166d24671d0 (diff) | |
| download | gitlab-ce-b595cb0c1dec83de5bdee18284abe86614bed33b.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42
Diffstat (limited to 'app/views/errors')
| -rw-r--r-- | app/views/errors/not_found.html.haml | 3 | ||||
| -rw-r--r-- | app/views/errors/omniauth_error.html.haml | 16 |
2 files changed, 12 insertions, 7 deletions
diff --git a/app/views/errors/not_found.html.haml b/app/views/errors/not_found.html.haml index 291adbc0ae8..54291cd9abc 100644 --- a/app/views/errors/not_found.html.haml +++ b/app/views/errors/not_found.html.haml @@ -11,5 +11,6 @@ = form_tag search_path, method: :get, class: 'form-inline-flex' do |f| .field = search_field_tag :search, '', placeholder: _('Search for projects, issues, etc.'), class: 'form-control' - = button_tag _('Search'), class: 'gl-button btn btn-sm btn-success', name: nil, type: 'submit' + = render Pajamas::ButtonComponent.new(variant: :confirm, size: :small, type: :submit) do + = _('Search') = render 'errors/footer' diff --git a/app/views/errors/omniauth_error.html.haml b/app/views/errors/omniauth_error.html.haml index e114e4609f8..3090c823677 100644 --- a/app/views/errors/omniauth_error.html.haml +++ b/app/views/errors/omniauth_error.html.haml @@ -2,14 +2,18 @@ .container = render partial: "shared/errors/graphic_422", formats: :svg - %h3 Sign-in using #{@provider} auth failed + %h3 + = _('Sign-in using %{provider} auth failed') % { provider: @provider } - %p.light.subtitle Sign-in failed because #{@error}. + %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 + %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' + = 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. + %p.light + = _('If none of the options work, try contacting a GitLab administrator.') |