summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2016-08-19 10:58:01 +0000
committerSean McGivern <sean@mcgivern.me.uk>2016-08-19 10:58:01 +0000
commit07f34709fcd2502963037c5f7f7adb8ec32dfc7b (patch)
tree01fb69152a6129f9e4d3dc304dd40c22937cd902 /CHANGELOG
parent473db1f9743f6f07b7c3d7fa53170d01662f9c82 (diff)
parent12fe6a6fd733110acc72aa0f5bdaec2b1fa1f358 (diff)
downloadgitlab-ce-07f34709fcd2502963037c5f7f7adb8ec32dfc7b.tar.gz
Merge branch 'master' into 'expiration-date-on-memberships'
# Conflicts: # db/schema.rb
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index a66c7536eb3..41c63bd5a93 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -30,6 +30,7 @@ v 8.11.0 (unreleased)
- Expand commit message width in repo view (ClemMakesApps)
- Cache highlighted diff lines for merge requests
- Pre-create all builds for a Pipeline when the new Pipeline is created !5295
+ - Allow merge request diff notes and discussions to be explicitly marked as resolved
- API: Add deployment endpoints
- API: Add Play endpoint on Builds
- Fix of 'Commits being passed to custom hooks are already reachable when using the UI'