diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-11-11 14:00:33 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-11-21 16:47:27 -0800 |
| commit | a0959430516f57ad27df21447777ebb226890647 (patch) | |
| tree | c5b022c387ef404a97c01461682870d417ba9449 /app/controllers | |
| parent | 704115c726999d6f0467bbf70087db3ae690d3ab (diff) | |
| download | gitlab-ce-a0959430516f57ad27df21447777ebb226890647.tar.gz | |
Fix rebase failures with Bitbucket changes
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/import/bitbucket_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/import/bitbucket_controller.rb b/app/controllers/import/bitbucket_controller.rb index ee30a24ab77..5326dce4ebb 100644 --- a/app/controllers/import/bitbucket_controller.rb +++ b/app/controllers/import/bitbucket_controller.rb @@ -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' |