summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-21 19:42:55 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-21 19:42:55 +0200
commit0ddf1d9dfdde8e8861ebe4bc31d29197694ee7ba (patch)
tree71bd19158ffc270467ef01465ba8e436bee934b7 /CHANGELOG
parentd68525ff97afb93523204953b1815f6ad35ae4cb (diff)
parent4e15cbf463c611dfad80e7f4a77e43638a356f98 (diff)
downloadgitlab-ce-0ddf1d9dfdde8e8861ebe4bc31d29197694ee7ba.tar.gz
Merge branch 'feature/edit_from_mr'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 7d03d6a6135..51f9523da73 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
v 6.7.0
- Add support for Gemnasium as a Project Service
+ - Add edit file button to MergeRequest diff
v 6.6.0
- Retrieving user ssh keys publically(github style): http://__HOST__/__USERNAME__.keys