summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-14 12:00:21 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-14 12:00:21 +0200
commit0d7986a8c7806a5d7630283f26667f954a5e61f7 (patch)
treedd99a049f0d1728fcb4a86a95a5f9afca0cf9cc6 /CHANGELOG
parent58e4e6b0819fcb385d790671d44c7a5051787e92 (diff)
parent9064fba071d06439ead76890015c3d38ffa63375 (diff)
downloadgitlab-ce-0d7986a8c7806a5d7630283f26667f954a5e61f7.tar.gz
Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq into dzaporozhets/gitlabhq-import-timeout
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG db/schema.rb
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 201990669a2..55a1a22e6b7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,7 @@ v 6.7.0
- Add GFM autocompletion for MergeRequests (Robert Speicher)
- Add webhook when a new tag is pushed (Jeroen van Baarsen)
- Add button for toggling inline comments in diff view
+ - Add retry feature for repository import
v 6.6.2
- Fix 500 error on branch/tag create or remove via UI