diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-07-20 13:43:34 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-07-20 13:43:34 +0000 |
| commit | f3d03af4215763d6c51c4b26702200ba679baded (patch) | |
| tree | ab73fb083d2d9fe5e3626b91c01de9bee8e42783 /CHANGELOG | |
| parent | 12c4fb1b0f5620fdda7f358280c3feeb3ea7d47f (diff) | |
| parent | 893cc5ec01b02a7183ae28ce815d6d14d0dfdeff (diff) | |
| download | gitlab-ce-f3d03af4215763d6c51c4b26702200ba679baded.tar.gz | |
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)
## 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
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 63fb78c8b02..748128f100a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -95,6 +95,7 @@ v 8.10.0 (unreleased) - Avoid to retrieve MR closes_issues as much as possible. - Add API endpoint for a group issues !4520 (mahcsig) - Add Bugzilla integration !4930 (iamtjg) + - Fix new snippet style bug (elliotec) - Instrument Rinku usage - Be explicit to define merge request discussion variables - Metrics for Rouge::Plugins::Redcarpet and Rouge::Formatters::HTMLGitlab |