summaryrefslogtreecommitdiff
path: root/lib/gitlab/fogbugz_import/importer.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/fogbugz_import/importer.rb')
-rw-r--r--lib/gitlab/fogbugz_import/importer.rb10
1 files changed, 5 insertions, 5 deletions
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