diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-11-30 19:19:00 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-30 19:19:00 +0000 |
commit | e618990af47d07d27e37cffd36e04537421d7e54 (patch) | |
tree | bdebe9d5a2c4d1e1037c9bfbd1a6c589d9349e3b /lib/api/snippets.rb | |
parent | c993cbbeaa02cf72c27e1686d8a1138a2deb2584 (diff) | |
parent | 500c0d5e419ecc39e823bdbfd49e4c5842621fa2 (diff) | |
download | gitlab-ce-e618990af47d07d27e37cffd36e04537421d7e54.tar.gz |
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
Diffstat (limited to 'lib/api/snippets.rb')
0 files changed, 0 insertions, 0 deletions