Commit f3d03af4 authored by Jacob Schatz's avatar Jacob Schatz

Merge branch 'issue-19641' into 'master'

Fix Issue 19641 (new snippets style bug)

## What does this MR do?
Fixes Issue 19641 (new snippets style bug)

## Are there points in the code the reviewer needs to double check?
Shouldn't be

## Why was this MR needed?
Requested in issue 19641 by Fatih Acet https://gitlab.com/gitlab-org/gitlab-ce/issues/19641

## What are the relevant issue numbers?
19641

## Screenshots (if relevant)
![Screenshot_2016-07-09_13.25.39](/uploads/8ead7ea8f4aae7ccaa4d2ddc495b6fe3/Screenshot_2016-07-09_13.25.39.png)
## Does this MR meet the acceptance criteria?
Yes

- [ x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ NA] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ NA] API support added
- Tests
  - [NA ] Added for this feature/bug
  - [ X] All builds are passing
- [X ] 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 you do - rebase it please)
- [ x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5170
parents 12c4fb1b 893cc5ec
...@@ -95,6 +95,7 @@ v 8.10.0 (unreleased) ...@@ -95,6 +95,7 @@ v 8.10.0 (unreleased)
- Avoid to retrieve MR closes_issues as much as possible. - Avoid to retrieve MR closes_issues as much as possible.
- Add API endpoint for a group issues !4520 (mahcsig) - Add API endpoint for a group issues !4520 (mahcsig)
- Add Bugzilla integration !4930 (iamtjg) - Add Bugzilla integration !4930 (iamtjg)
- Fix new snippet style bug (elliotec)
- Instrument Rinku usage - Instrument Rinku usage
- Be explicit to define merge request discussion variables - Be explicit to define merge request discussion variables
- Metrics for Rouge::Plugins::Redcarpet and Rouge::Formatters::HTMLGitlab - Metrics for Rouge::Plugins::Redcarpet and Rouge::Formatters::HTMLGitlab
......
...@@ -232,7 +232,9 @@ ...@@ -232,7 +232,9 @@
.nav-block { .nav-block {
.controls { .controls {
float: right; float: right;
margin-top: 11px; margin-top: 8px;
padding-bottom: 7px;
border-bottom: 1px solid $border-color;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment