Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-03-29 19:43:23 +0300
committerJames Lopez <james@jameslopez.es>2016-03-29 19:43:23 +0300
commit075b56aae2e045e930580985234276edb353747f (patch)
tree1bebfbb800e409522b816b069f1ad8ff0fa70558 /lib/gitlab/fogbugz_import
parentc93570d8fb439a8a60a204bcc41e5e8a720730e4 (diff)
more fixes after doing more manual testing on importing
Diffstat (limited to 'lib/gitlab/fogbugz_import')
-rw-r--r--lib/gitlab/fogbugz_import/project_creator.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/fogbugz_import/project_creator.rb b/lib/gitlab/fogbugz_import/project_creator.rb
index 15914aea3b9..939cb96c101 100644
--- a/lib/gitlab/fogbugz_import/project_creator.rb
+++ b/lib/gitlab/fogbugz_import/project_creator.rb
@@ -25,7 +25,8 @@ module Gitlab
).execute
import_data = project.import_data
- import_data.credentials.merge!('fb_session' => fb_session)
+ # merge! with a bang doesn't work here
+ import_data.credentials = import_data.credentials.merge('fb_session' => fb_session)
import_data.data = { 'repo' => repo.raw_data, 'user_map' => user_map }
import_data.save