summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2016-04-29 10:45:22 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2016-04-29 10:45:22 +0000
commit6d716fbd4d1569285950dfb78b703ea84aadd436 (patch)
tree94a14c0e2c1eed29b12e9fe810c823eea65a6b5a
parent4997a1e321a8f45fc7788cd5704d09ca00e13efa (diff)
parent39ed7c18e9881416a7ca8b689a3e1fdde91f12c2 (diff)
downloadgitlab-ce-6d716fbd4d1569285950dfb78b703ea84aadd436.tar.gz
Merge branch 'fix-changelog' into 'master'
Fixed CHANGELOG for 8.7.1/8.7.2 See merge request !3978
-rw-r--r--CHANGELOG6
1 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index d453ae19e77..569185fa2a1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,7 +13,10 @@ v 8.8.0 (unreleased)
- Backport GitLab Enterprise support from EE
- Files over 5MB can only be viewed in their raw form, files over 1MB without highlighting !3718
-v 8.7.1 (unreleased)
+v 8.7.2
+ - The "New Branch" button is now loaded asynchronously
+
+v 8.7.1
- Throttle the update of `project.last_activity_at` to 1 minute. !3848
- Fix .gitlab-ci.yml parsing issue when hidde job is a template without script definition. !3849
- Fix license detection to detect all license files, not only known licenses. !3878
@@ -21,7 +24,6 @@ v 8.7.1 (unreleased)
- Prevent users from deleting Webhooks via API they do not own
- Fix Error 500 due to stale cache when projects are renamed or transferred
- Update width of search box to fix Safari bug. !3900 (Jedidiah)
- - The "New Branch" button is now loaded asynchronously
- Use the `can?` helper instead of `current_user.can?`
v 8.7.0