diff options
author | Stan Hu <stanhu@gmail.com> | 2018-06-25 22:40:11 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-06-25 22:40:11 -0700 |
commit | 046a5e398d202be5865a850cf778fedd9bd39c47 (patch) | |
tree | d2d6115e327c3da5ace7b2456480f04386a69f59 /app/controllers/import | |
parent | c9deb7cef8d0d85a8773b0e6d26ae12a3ff25a0e (diff) | |
download | gitlab-ce-046a5e398d202be5865a850cf778fedd9bd39c47.tar.gz |
More work towards supporting Bitbucket Server
Diffstat (limited to 'app/controllers/import')
-rw-r--r-- | app/controllers/import/bitbucket_server_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/import/bitbucket_server_controller.rb b/app/controllers/import/bitbucket_server_controller.rb index 3662708c890..b9397502414 100644 --- a/app/controllers/import/bitbucket_server_controller.rb +++ b/app/controllers/import/bitbucket_server_controller.rb @@ -20,7 +20,7 @@ class Import::BitbucketServerController < Import::BaseController target_namespace = find_or_create_namespace(namespace_path, current_user) if current_user.can?(:create_projects, target_namespace) - project = Gitlab::BitbucketImport::ProjectCreator.new(repo, project_name, target_namespace, current_user, credentials).execute + project = Gitlab::BitbucketServerImport::ProjectCreator.new(project_slug, repo_slug, repo, project_name, target_namespace, current_user, credentials).execute if project.persisted? render json: ProjectSerializer.new.represent(project) @@ -86,7 +86,7 @@ class Import::BitbucketServerController < Import::BaseController { base_uri: session[bitbucket_server_url_key], username: session[bitbucket_server_username_key], - personal_access_token: session[personal_access_token_key] + password: session[personal_access_token_key] } end end |