4 files changed, 8 insertions, 18 deletions
diff --git a/lib/gitlab/bitbucket_import/project_creator.rb b/lib/gitlab/bitbucket_import/project_creator.rb
index 109010cb962..65b62b2b816 100644
--- a/lib/gitlab/bitbucket_import/project_creator.rb
+++ b/lib/gitlab/bitbucket_import/project_creator.rb
@@ -23,10 +23,7 @@ module Gitlab
           import_url: "ssh://git@bitbucket.org/#{repo["owner"]}/#{repo["slug"]}.git",
         ).execute
 
-        import_data = project.import_data
-        # merge! with a bang doesn't work here
-        import_data.credentials = import_data.credentials.merge(bb_session: session_data)
-        import_data.save
+        project.update_import_data(credentials: { bb_session: session_data })
 
         project
       end
diff --git a/lib/gitlab/fogbugz_import/importer.rb b/lib/gitlab/fogbugz_import/importer.rb
index 42f9b6eab84..501d5a95547 100644
--- a/lib/gitlab/fogbugz_import/importer.rb
+++ b/lib/gitlab/fogbugz_import/importer.rb
@@ -18,7 +18,7 @@ module Gitlab
 
       def execute
         return true unless repo.valid?
-        client = Gitlab::FogbugzImport::Client.new(token: import_data_credentials[:fb_session][:token], uri: import_data_credentials[:fb_session][:uri])
+        client = Gitlab::FogbugzImport::Client.new(token: fb_session[:token], uri: fb_session[:uri])
 
         @cases = client.cases(@repo.id.to_i)
         @categories = client.categories
@@ -30,8 +30,8 @@ module Gitlab
 
       private
 
-      def import_data_credentials
-        @import_data_credentials ||= project.import_data.credentials if project.import_data
+      def fb_session
+        @import_data_credentials ||= project.import_data.credentials[:fb_session] if project.import_data && project.import_data.credentials
       end
 
       def user_map
@@ -240,8 +240,8 @@ module Gitlab
       end
 
       def build_attachment_url(rel_url)
-        uri = import_data_credentials[:fb_session][:uri]
-        token = import_data_credentials[:fb_session][:token]
+        uri = fb_session[:uri]
+        token = fb_session[:token]
         "#{uri}/#{rel_url}&token=#{token}"
       end
 
diff --git a/lib/gitlab/fogbugz_import/project_creator.rb b/lib/gitlab/fogbugz_import/project_creator.rb
index e9fac8968e6..c000b300468 100644
--- a/lib/gitlab/fogbugz_import/project_creator.rb
+++ b/lib/gitlab/fogbugz_import/project_creator.rb
@@ -24,12 +24,7 @@ module Gitlab
           import_url: Project::UNKNOWN_IMPORT_URL
         ).execute
 
-        import_data = project.import_data
-        import_data.data = { 'repo' => repo.raw_data, 'user_map' => user_map }
-
-        # merge! with a bang doesn't work here
-        import_data.credentials = import_data.credentials.merge(fb_session: fb_session)
-        import_data.save
+        project.update_import_data(data: { 'repo' => repo.raw_data, 'user_map' => user_map }, credentials: { fb_session: fb_session })
 
         project
       end
diff --git a/lib/gitlab/google_code_import/project_creator.rb b/lib/gitlab/google_code_import/project_creator.rb
index 49d6013af28..d2e20afbb1e 100644
--- a/lib/gitlab/google_code_import/project_creator.rb
+++ b/lib/gitlab/google_code_import/project_creator.rb
@@ -24,9 +24,7 @@ module Gitlab
           import_url: repo.import_url
         ).execute
 
-        import_data = project.import_data
-        import_data.data = { 'repo' => repo.raw_data, 'user_map' => user_map }
-        import_data.save
+        project.update_import_data(data: { 'repo' => repo.raw_data, 'user_map' => user_map })
 
         project
       end