diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-12-21 00:40:32 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-12-21 00:40:32 +0000 |
| commit | e4506330b411e8fa855c0f6a781ba66c2607c90e (patch) | |
| tree | 29d292d794d9406698c06ebb466f323f3f6d538d /app/controllers/projects/commit_controller.rb | |
| parent | b86f45004e931655176220d451cde1e9320a1db1 (diff) | |
| parent | 85666b7077728aeb2015030d603bc9c9fe6686c6 (diff) | |
| download | gitlab-ce-e4506330b411e8fa855c0f6a781ba66c2607c90e.tar.gz | |
Merge branch '25835-alert-wrapper-creates-extra-margin' into 'master'
Apply margin on alert banners only when there is one or more alerts
## What does this MR do?
Fixes extra margin added to all pages by !8151
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [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)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #25835
See merge request !8209
Diffstat (limited to 'app/controllers/projects/commit_controller.rb')
0 files changed, 0 insertions, 0 deletions