summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-11-11 16:07:16 -0800
committerStan Hu <stanhu@gmail.com>2016-11-21 16:47:28 -0800
commit9860488360681a3b10c3de04606ef931c3639601 (patch)
tree66e933ab2fc1b705121804a3127fa73a0f84d063
parente2688feeb3075265fb926bbd68560b2046afa0c5 (diff)
downloadgitlab-ce-9860488360681a3b10c3de04606ef931c3639601.tar.gz
Fix missing Bitbucket ProjectController changes for specifying namespace/project
-rw-r--r--lib/gitlab/bitbucket_import/project_creator.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/gitlab/bitbucket_import/project_creator.rb b/lib/gitlab/bitbucket_import/project_creator.rb
index 9d80c5d4f2b..b34be272af3 100644
--- a/lib/gitlab/bitbucket_import/project_creator.rb
+++ b/lib/gitlab/bitbucket_import/project_creator.rb
@@ -1,10 +1,11 @@
module Gitlab
module BitbucketImport
class ProjectCreator
- attr_reader :repo, :namespace, :current_user, :session_data
+ attr_reader :repo, :name, :namespace, :current_user, :session_data
- def initialize(repo, namespace, current_user, session_data)
+ def initialize(repo, name, namespace, current_user, session_data)
@repo = repo
+ @name = name
@namespace = namespace
@current_user = current_user
@session_data = session_data
@@ -13,8 +14,8 @@ module Gitlab
def execute
::Projects::CreateService.new(
current_user,
- name: repo.name,
- path: repo.slug,
+ name: name,
+ path: name,
description: repo.description,
namespace_id: namespace.id,
visibility_level: repo.visibility_level,