summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-25 09:21:45 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-25 09:21:45 -0800
commita52529f9b6258b2ae2793930096c3fcbe40078f3 (patch)
treefc28baed1a41a50892215c94ccee3f2eddf9772c /CHANGELOG
parent7475f4f00d999a603eb01a0b70a966db1cd243d8 (diff)
parent56f51bed6b166f12b8b0f4f1bd883142c5e079a6 (diff)
downloadgitlab-ce-a52529f9b6258b2ae2793930096c3fcbe40078f3.tar.gz
Merge branch 'bitbucket-import'
Conflicts: app/views/import/gitorious/status.html.haml db/schema.rb
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG2
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 90591684757..9220411b3d7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,8 @@ v 7.8.1
- Fix the warning for LDAP users about need to set password
- Fix avatars which were not shown for non logged in users
- Fix urls for the issues when relative url was enabled
+ - Add Bitbucket omniauth provider.
+ - Add Bitbucket importer.
v 7.8.0
- Fix access control and protection against XSS for note attachments and other uploads.