diff options
| author | James Lopez <james@jameslopez.es> | 2016-04-04 09:57:52 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-04-04 09:57:52 +0200 |
| commit | ef85c510fa24a0deec6f680f9226dccd937a7bbe (patch) | |
| tree | eae410409ed87c07d73cbdfb5be83184a63a0151 | |
| parent | 43ee65e173cbb4f846c118c531f635dc0f8602ac (diff) | |
| download | gitlab-ce-ef85c510fa24a0deec6f680f9226dccd937a7bbe.tar.gz | |
corrected a couple of based on MR review
| -rw-r--r-- | db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/fogbugz_import/importer.rb | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb b/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb index fb5d8591c09..60f86c74df0 100644 --- a/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb +++ b/db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb @@ -16,8 +16,8 @@ class RemoveWrongImportUrlFromProjects < ActiveRecord::Migration say("Projects and Github projects with a wrong URL. It also migrates Gitlab project credentials.") in_transaction { process_projects_with_wrong_url } - say("Migrating bitbucket credentials...")# TODO remove last param - in_transaction { process_project(import_type: 'bitbucket', unencrypted_data: ['repo', 'user_map']) } + say("Migrating bitbucket credentials...") + in_transaction { process_project(import_type: 'bitbucket') } say("Migrating fogbugz credentials...") in_transaction { process_project(import_type: 'fogbugz', unencrypted_data: ['repo', 'user_map']) } diff --git a/lib/gitlab/fogbugz_import/importer.rb b/lib/gitlab/fogbugz_import/importer.rb index fffeb66ce26..5c1c1c4865a 100644 --- a/lib/gitlab/fogbugz_import/importer.rb +++ b/lib/gitlab/fogbugz_import/importer.rb @@ -8,7 +8,7 @@ module Gitlab import_data = project.import_data.try(:data) repo_data = import_data['repo'] if import_data - if defined?(repo_data) + if repo_data @repo = FogbugzImport::Repository.new(repo_data) @known_labels = Set.new else @@ -18,7 +18,6 @@ module Gitlab def execute 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']) @cases = client.cases(@repo.id.to_i) |