summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-08-24 19:20:25 +0000
committerDouwe Maan <douwe@gitlab.com>2015-08-24 19:20:25 +0000
commitfeab3664f5116a198f5bf0457e8d7a3d81f19368 (patch)
tree67692f8484522d08177c2093292e61809a54793e
parentdd215d79048d7cbf47df444e437c3e2ef8380bc1 (diff)
parenteeac2aafbc444b1fe5ada430b15058b30628b364 (diff)
downloadgitlab-ce-feab3664f5116a198f5bf0457e8d7a3d81f19368.tar.gz
Merge branch 'rs-7-14-1-changelog' into 'master'
Move full_host fix changelog entry to 7.14.1 [ci skip] See merge request !1191
-rw-r--r--CHANGELOG4
1 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f22c337b726..5137879d318 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,7 +3,6 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.0.0 (unreleased)
- Fix Error 500 in API when accessing a group that has an avatar (Stan Hu)
- Remove user OAuth tokens from the database and request new tokens each session (Stan Hu)
- - Only include base URL in OmniAuth full_host parameter (Stan Hu)
- Only show recent push event if the branch still exists or a recent merge request has not been created (Stan Hu)
- Remove satellites
- Better performance for web editor (switched from satellites to rugged)
@@ -15,6 +14,9 @@ v 8.0.0 (unreleased)
- Create cross-reference for closing references on commits pushed to non-default branches (Maƫl Valais)
- Ability to search milestones
+v 7.14.1 (unreleased)
+ - Only include base URL in OmniAuth full_host parameter (Stan Hu)
+
v 7.14.0
- Fix bug where non-project members of the target project could set labels on new merge requests.
- Update default robots.txt rules to disallow crawling of irrelevant pages (Ben Bodenmiller)