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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
ee843346
Commit
ee843346
authored
8 years ago
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix importing PRs with not existing branches
parent
84f2c219
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
lib/bitbucket/connection.rb
lib/bitbucket/connection.rb
+1
-1
lib/gitlab/bitbucket_import/importer.rb
lib/gitlab/bitbucket_import/importer.rb
+2
-2
No files found.
lib/bitbucket/connection.rb
View file @
ee843346
...
...
@@ -45,7 +45,7 @@ module Bitbucket
@expires_at
=
response
.
expires_at
@expires_in
=
response
.
expires_in
@refresh_token
=
response
.
refresh_token
@connection
=
nil
@connection
=
nil
end
private
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/bitbucket_import/importer.rb
View file @
ee843346
...
...
@@ -81,10 +81,10 @@ module Gitlab
description:
description
,
source_project:
project
,
source_branch:
pull_request
.
source_branch_name
,
source_branch_sha:
p
roject
.
repository
.
rugged
.
lookup
(
pull_request
.
source_branch_sha
).
oid
,
source_branch_sha:
p
ull_request
.
source_branch_sha
,
target_project:
project
,
target_branch:
pull_request
.
target_branch_name
,
target_branch_sha:
p
roject
.
repository
.
rugged
.
lookup
(
pull_request
.
target_branch_sha
).
oid
,
target_branch_sha:
p
ull_request
.
target_branch_sha
,
state:
pull_request
.
state
,
author_id:
gitlab_user_id
(
project
,
pull_request
.
author
),
assignee_id:
nil
,
...
...
This diff is collapsed.
Click to expand it.
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