diff options
| author | elliotec <elliotecweb@gmail.com> | 2016-07-11 10:48:48 -0600 |
|---|---|---|
| committer | elliotec <elliotecweb@gmail.com> | 2016-07-11 10:48:48 -0600 |
| commit | 67f90c79840bcfca6d8d42a9f6620ef9eb7972c7 (patch) | |
| tree | 7bffd1f38c97add5d384cadec936bb479057c9ba | |
| parent | bc133c1e24eeb40946f4bb068a22b406589629e0 (diff) | |
| download | gitlab-ce-67f90c79840bcfca6d8d42a9f6620ef9eb7972c7.tar.gz | |
resolve changelog conflict
| -rw-r--r-- | CHANGELOG | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 5559c4a7fe2..538c635ec3f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -43,6 +43,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 - Metrics for Rouge::Plugins::Redcarpet and Rouge::Formatters::HTMLGitlab - RailsCache metris now includes fetch_hit/fetch_miss and read_hit/read_miss info. @@ -60,7 +61,6 @@ v 8.10.0 (unreleased) - Fix 404 redirect after validation fails importing a GitLab project - Added setting to set new users by default as external !4545 (Dravere) - Add min value for project limit field on user's form !3622 (jastkand) - - Fix new snippet style bug v 8.9.5 - Add more debug info to import/export and memory killer. !5108 |