summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-02-10 19:01:44 +0000
committerRobert Speicher <robert@gitlab.com>2016-02-10 19:01:44 +0000
commit51998fddcaafdb2c09dc456b877e1ceb709cd17d (patch)
treec2fa46c9aba0c067b2d5676c6e3e3d050fdc241c /CHANGELOG
parent5f07e13b7d04aad6e9a84c964a9239de0604b20a (diff)
parentb62cdc3c479365b2c96400c44b5e31eeb3d0c204 (diff)
downloadgitlab-ce-51998fddcaafdb2c09dc456b877e1ceb709cd17d.tar.gz
Merge branch 'cwq1913/gitlab-ce-fix_skip_merge_commits' into 'master'
Actually use the `skip_merges` option in Repository#commits Originally opened at !2067 by @cwq1913. See merge request !2750
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 800f9c7918f..9014413b824 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -31,6 +31,7 @@ v 8.5.0 (unreleased)
- Optimized performance of finding issues to be closed by a merge request
- API: Expose MergeRequest#merge_status (Andrei Dziahel)
- Revert "Add IP check against DNSBLs at account sign-up"
+ - Actually use the `skip_merges` option in Repository#commits (Tony Chu)
- Fix API to keep request parameters in Link header (Michael Potthoff)
- Deprecate API "merge_request/:merge_request_id/comments". Use "merge_requests/:merge_request_id/notes" instead
- Deprecate API "merge_request/:merge_request_id/...". Use "merge_requests/:merge_request_id/..." instead