diff options
author | James Lopez <james@jameslopez.es> | 2016-04-05 16:41:15 +0300 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-04-05 16:41:15 +0300 |
commit | 5e51fce4dcd62997f372aed44badc844f98851e9 (patch) | |
tree | 5599e0de61315e6274449c11c1fa011c91f8d749 /lib/gitlab/fogbugz_import | |
parent | 850180aa393e2cfc124bb9687a123a196cff734c (diff) |
some refactoring to symbolise keys across importers and left a TODO
Diffstat (limited to 'lib/gitlab/fogbugz_import')
-rw-r--r-- | lib/gitlab/fogbugz_import/importer.rb | 8 | ||||
-rw-r--r-- | lib/gitlab/fogbugz_import/project_creator.rb | 2 |
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 |