some refactoring to symbolise keys across importers and left a TODO

2 files changed, 5 insertions, 5 deletions

diff --git a/lib/gitlab/fogbugz_import/importer.rb b/lib/gitlab/fogbugz_import/importer.rb
index 5c1c1c4865a..249c5b48b1c 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: import_data_credentials[:fb_session][:token], uri: import_data_credentials[:fb_session][:uri])
 
         @cases = client.cases(@repo.id.to_i)
         @categories = client.categories
@@ -31,7 +31,7 @@ module Gitlab
       private
 
       def import_data_credentials
-        @import_data_credentials ||= project.import_data.stringified_credentials if project.import_data
+        @import_data_credentials ||= project.import_data if project.import_data
       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 = import_data_credentials[:fb_session][:uri]
+        token = import_data_credentials[: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 0a87b406c56..e9fac8968e6 100644
--- a/lib/gitlab/fogbugz_import/project_creator.rb
+++ b/lib/gitlab/fogbugz_import/project_creator.rb
@@ -28,7 +28,7 @@ module Gitlab
         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.credentials = import_data.credentials.merge(fb_session: fb_session)
         import_data.save
 
         project