-
- Downloads
Merge branch 'issue_24363' into 'master'
Fix appearance in error pages ## What does this MR do? The error pages under `app/views/errors/*` looks like the error page for 404 `public/404.html` ## Are there points in the code the reviewer needs to double check? I restructured how the GitLab logo is shown in the `public/404.html` and all the pages under `app/views/errors/*`. ## Why was this MR needed? #24363 ## Screenshots (if relevant) Before  After  ## Does this MR meet the acceptance criteria? - [X] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [X] Branch has no merge conflicts with `master` (if it does - rebase it please) - [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !7635
No related branches found
No related tags found
Showing
- app/views/errors/access_denied.html.haml 10 additions, 6 deletionsapp/views/errors/access_denied.html.haml
- app/views/errors/encoding.html.haml 9 additions, 5 deletionsapp/views/errors/encoding.html.haml
- app/views/errors/git_not_found.html.haml 10 additions, 7 deletionsapp/views/errors/git_not_found.html.haml
- app/views/errors/not_found.html.haml 9 additions, 5 deletionsapp/views/errors/not_found.html.haml
- app/views/errors/omniauth_error.html.haml 10 additions, 6 deletionsapp/views/errors/omniauth_error.html.haml
- app/views/layouts/errors.html.haml 57 additions, 8 deletionsapp/views/layouts/errors.html.haml
- changelogs/unreleased/issue_24363.yml 4 additions, 0 deletionschangelogs/unreleased/issue_24363.yml
- public/404.html 4 additions, 1 deletionpublic/404.html
- public/422.html 4 additions, 1 deletionpublic/422.html
- public/500.html 4 additions, 1 deletionpublic/500.html
- public/502.html 4 additions, 1 deletionpublic/502.html
- public/503.html 4 additions, 1 deletionpublic/503.html
changelogs/unreleased/issue_24363.yml
0 → 100644
Please register or sign in to comment