Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
a0959430
Commit
a0959430
authored
Nov 11, 2016
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rebase failures with Bitbucket changes
parent
704115c7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/controllers/import/bitbucket_controller.rb
app/controllers/import/bitbucket_controller.rb
+2
-2
No files found.
app/controllers/import/bitbucket_controller.rb
View file @
a0959430
...
...
@@ -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_nam
e
,
repo_owner
)
namespace
=
find_or_create_namespace
(
@target_namespac
e
,
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'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment