summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-25 14:13:05 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-25 14:13:05 +0000
commit429c0d14918d8727eac0e24ff01df5cdf55b2f79 (patch)
treec281b17db6d232d257170f5f04e99de911ce5317 /CHANGELOG
parent1c2ce6efde2de7ed1b969623856c6a18f6b8f385 (diff)
parent3bee4a6712a654abeba4ce07eb17235c3240b487 (diff)
downloadgitlab-ce-429c0d14918d8727eac0e24ff01df5cdf55b2f79.tar.gz
Merge branch 'fix-reload-with-full-diff-in-compare-branch' into 'master'
Fix "Reload with full diff" URL button in compare branch view This button worked when viewing merge requests because the JavaScript stripped the .html in the Ajax request. However, it left the .html suffix in the compare branch view. See merge request !1195
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 8d84e41958e..a66e898652c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.0.0 (unreleased)
- Upgrade browser gem to 1.0.0 to avoid warning in IE11 compatibilty mode (Stan Hu)
+ - Fix "Reload with full diff" URL button in compare branch view (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