diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /app/views/errors | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
download | gitlab-ce-7e9c479f7de77702622631cff2628a9c8dcbc627.tar.gz |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'app/views/errors')
-rw-r--r-- | app/views/errors/access_denied.html.haml | 2 | ||||
-rw-r--r-- | app/views/errors/not_found.html.haml | 2 | ||||
-rw-r--r-- | app/views/errors/omniauth_error.html.haml | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/views/errors/access_denied.html.haml b/app/views/errors/access_denied.html.haml index 1ed7b56db1d..ce921060cab 100644 --- a/app/views/errors/access_denied.html.haml +++ b/app/views/errors/access_denied.html.haml @@ -11,6 +11,6 @@ %p = s_('403|Please contact your GitLab administrator to get permission.') .action-container.js-go-back{ hidden: true } - %button{ type: 'button', class: 'btn btn-success' } + %button{ type: 'button', class: 'gl-button btn btn-success' } = s_('Go Back') = render "errors/footer" diff --git a/app/views/errors/not_found.html.haml b/app/views/errors/not_found.html.haml index 13f07e2f5d5..291adbc0ae8 100644 --- a/app/views/errors/not_found.html.haml +++ b/app/views/errors/not_found.html.haml @@ -11,5 +11,5 @@ = 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: 'btn btn-sm btn-success', name: nil, type: 'submit' + = button_tag _('Search'), class: 'gl-button btn btn-sm btn-success', name: nil, type: 'submit' = render 'errors/footer' diff --git a/app/views/errors/omniauth_error.html.haml b/app/views/errors/omniauth_error.html.haml index a2a4c75daad..0e9041d07ea 100644 --- a/app/views/errors/omniauth_error.html.haml +++ b/app/views/errors/omniauth_error.html.haml @@ -8,8 +8,8 @@ %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: 'btn primary' - = link_to "Recover password", new_password_path(:user), class: '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. |