Skip to content
Snippets Groups Projects
Commit a0959430 authored by Stan Hu's avatar Stan Hu
Browse files

Fix rebase failures with Bitbucket changes

parent 704115c7
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -47,9 +47,9 @@ class Import::BitbucketController < Import::BaseController
repo_owner = current_user.username if repo_owner == client.user.username
@target_namespace = params[:new_namespace].presence || repo_owner
 
namespace = find_or_create_namespace(target_namespace_name, repo_owner)
namespace = find_or_create_namespace(@target_namespace, repo_owner)
 
if current_user.can?(:create_projects, @target_namespace)
if current_user.can?(:create_projects, namespace)
@project = Gitlab::BitbucketImport::ProjectCreator.new(repo, namespace, current_user, credentials).execute
else
render 'unauthorized'
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment