kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

corrected a couple of based on MR review

Browse source
This commit is contained in:
James Lopez 2016-04-04 09:57:52 +02:00
parent 43ee65e173
commit ef85c510fa
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb
View file

@ -16,8 +16,8 @@ class RemoveWrongImportUrlFromProjects < ActiveRecord::Migration
say("Projects and Github projects with a wrong URL. It also migrates Gitlab project credentials.") say("Projects and Github projects with a wrong URL. It also migrates Gitlab project credentials.")
in_transaction { process_projects_with_wrong_url } in_transaction { process_projects_with_wrong_url }
say("Migrating bitbucket credentials...")# TODO remove last param say("Migrating bitbucket credentials...")
in_transaction { process_project(import_type: 'bitbucket', unencrypted_data: ['repo', 'user_map']) } in_transaction { process_project(import_type: 'bitbucket') }
say("Migrating fogbugz credentials...") say("Migrating fogbugz credentials...")
in_transaction { process_project(import_type: 'fogbugz', unencrypted_data: ['repo', 'user_map']) } in_transaction { process_project(import_type: 'fogbugz', unencrypted_data: ['repo', 'user_map']) }

3
lib/gitlab/fogbugz_import/importer.rb
View file

@ -8,7 +8,7 @@ module Gitlab
import_data = project.import_data.try(:data) import_data = project.import_data.try(:data)
repo_data = import_data['repo'] if import_data repo_data = import_data['repo'] if import_data
if defined?(repo_data) if repo_data
@repo = FogbugzImport::Repository.new(repo_data) @repo = FogbugzImport::Repository.new(repo_data)
@known_labels = Set.new @known_labels = Set.new
else else
@ -18,7 +18,6 @@ module Gitlab
def execute def execute
return true unless repo.valid? return true unless repo.valid?
Rails.logger.error import_data_credentials.inspect
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) @cases = client.cases(@repo.id.to_i)