summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2016-08-25 13:54:56 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2016-08-25 13:54:56 +0000
commita03da79fb2371ca0d866ce776bfb0bfe9f1be1df (patch)
treebb17e000a8305a459d88986f5d7aa07f808f49bc
parent9ffa52e9fd4f69451304d877f58a6c0e9027eb9f (diff)
parent5b846a5d450197e7bcb4d8cbfc65388812beae63 (diff)
downloadgitlab-ce-a03da79fb2371ca0d866ce776bfb0bfe9f1be1df.tar.gz
Merge branch 'fix-changelog' into 'master'
Moved two 8.11 changelog entries to 8.12 See merge request !6022
-rw-r--r--CHANGELOG4
1 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 64f4fb76bda..104f37003c9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,16 +9,16 @@ v 8.12.0 (unreleased)
- Add Sentry logging to API calls
- Added tests for diff notes
- Added 'only_allow_merge_if_build_succeeds' project setting in the API. !5930 (Duck)
+ - Reduce number of database queries on builds tab
+ - Use the default branch for displaying the project icon instead of master !5792 (Hannes Rosenögger)
v 8.11.2 (unreleased)
- Show "Create Merge Request" widget for push events to fork projects on the source project
- - Reduce number of database queries on builds tab
v 8.11.1 (unreleased)
- Does not halt the GitHub import process when an error occurs
- Fix file links on project page when default view is Files !5933
- Change using size to use count and caching it for number of group members
- - Use the default branch for displaying the project icon instead of master !5792 (Hannes Rosenögger)
v 8.11.0
- Use test coverage value from the latest successful pipeline in badge. !5862