some refactoring based on feedback

This commit is contained in:
James Lopez
2016-03-21 13:15:51 +01:00
parent 5f86912ef0
commit 383cc84047
7 changed files with 61 additions and 49 deletions
+1 -1
View File
@@ -8,7 +8,7 @@ module Gitlab
def initialize(project)
@project = project
credentials = project.import_data.credentials if import_data
@client = Client.new(credentials["github_access_token"])
@client = Client.new(credentials[:user])
@formatter = Gitlab::ImportFormatter.new
end
+2 -12
View File
@@ -11,7 +11,7 @@ module Gitlab
end
def execute
project = ::Projects::CreateService.new(
::Projects::CreateService.new(
current_user,
name: repo.name,
path: repo.name,
@@ -20,19 +20,9 @@ module Gitlab
visibility_level: repo.private ? Gitlab::VisibilityLevel::PRIVATE : Gitlab::VisibilityLevel::PUBLIC,
import_type: "github",
import_source: repo.full_name,
import_url: repo.clone_url,
import_url: repo.clone_url.sub("https://", "https://#{@session_data[:github_access_token]}@"),
wiki_enabled: !repo.has_wiki? # If repo has wiki we'll import it later
).execute
create_import_data(project)
project
end
private
def create_import_data(project)
project.create_import_data(
credentials: { github_access_token: session_data.delete(:github_access_token) })
end
end
end
+1 -3
View File
@@ -12,9 +12,7 @@ module Gitlab
end
def import_url
import_url = Gitlab::ImportUrlExposer.expose(import_url: project.import_url,
credentials: project.import_data.credentials)
import_url.sub(/\.git\z/, ".wiki.git")
project.import_url.import_url.sub(/\.git\z/, ".wiki.git")
end
end
end