summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-14 08:19:33 +0000
committerDouwe Maan <douwe@gitlab.com>2015-04-14 08:19:33 +0000
commit41cdc5eb8a5add35196b185280dd1a5237c6c418 (patch)
tree6bf51ff02fbc806bb56d090a018b2d0d74ee7918
parent79b4d0b0c0682fc31d794d8b42d02b3d1bb5b9dc (diff)
parent5fa7be3ab40de4cb411bf47e1afd417023e54bc9 (diff)
downloadgitlab-ce-41cdc5eb8a5add35196b185280dd1a5237c6c418.tar.gz
Merge branch 'fix_changelog' into 'master'
Fix wrong merged changelog entries See merge request !514
-rw-r--r--CHANGELOG5
1 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 3dd8af32d0d..fc721d3d155 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,7 +19,6 @@ v 7.10.0 (unreleased)
- Disable reference creation for comments surrounded by code/preformatted blocks (Stan Hu)
- Reduce Rack Attack false positives causing 403 errors during HTTP authentication (Stan Hu)
- enable line wrapping per default and remove the checkbox to toggle it (Hannes Rosenögger)
- - extend the commit calendar to show the actual commits made on a date (Hannes Rosenögger)
- Fix a link in the patch update guide
- Add a service to support external wikis (Hannes Rosenögger)
- Omit the "email patches" link and fix plain diff view for merge commits
@@ -82,9 +81,11 @@ v 7.9.3
- Allow admin to create public deploy keys that are accessible to any project.
- Warn when gitlab-shell version doesn't match requirement.
- Skip email confirmation when set by admin or via LDAP.
-
- Only allow users to reference groups, projects, issues, MRs, commits they have access to.
+v 7.9.3
+ - Contains no changes
+
v 7.9.2
- Contains no changes