summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-08-24 15:23:10 +0000
committerDouwe Maan <douwe@gitlab.com>2015-08-24 15:23:10 +0000
commite449426a4e7d15cdd582d4f136add52cbfb5e04e (patch)
tree45177341a5b6691fd32dac5460f763d64ab05671 /CHANGELOG
parentadd099b024cc4155a5be494fdb9ae339fd073a14 (diff)
parent19f478e00d1508728d0170ac60defed0535a0789 (diff)
downloadgitlab-ce-e449426a4e7d15cdd582d4f136add52cbfb5e04e.tar.gz
Merge branch 'fix-error-500-groups-with-avatar' into 'master'
Fix Error 500 in API when accessing a group that has an avatar Closes #2340 See merge request !1189
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 7ec1dabcf95..67ded53ad79 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
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 show recent push event if the branch still exists or a recent merge request has not been created (Stan Hu)
- Remove satellites