diff options
author | James Lopez <james@jameslopez.es> | 2016-03-29 19:43:23 +0300 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-03-29 19:43:23 +0300 |
commit | 075b56aae2e045e930580985234276edb353747f (patch) | |
tree | 1bebfbb800e409522b816b069f1ad8ff0fa70558 /lib/gitlab/bitbucket_import | |
parent | c93570d8fb439a8a60a204bcc41e5e8a720730e4 (diff) |
more fixes after doing more manual testing on importing
Diffstat (limited to 'lib/gitlab/bitbucket_import')
-rw-r--r-- | lib/gitlab/bitbucket_import/project_creator.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/bitbucket_import/project_creator.rb b/lib/gitlab/bitbucket_import/project_creator.rb index 7dc3e01753a..cc7f2017142 100644 --- a/lib/gitlab/bitbucket_import/project_creator.rb +++ b/lib/gitlab/bitbucket_import/project_creator.rb @@ -24,7 +24,8 @@ module Gitlab ).execute import_data = project.import_data - import_data.credentials.merge!("bb_session" => session_data) + # merge! with a bang doesn't work here + import_data.credentials = import_data.credentials.merge("bb_session" => session_data) import_data.save project |