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
Jérome Perrin
gitlab-ce
Commits
c19d5ac1
Commit
c19d5ac1
authored
Sep 22, 2017
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Expand truncated Bitbucket pull request source/target SHA if possible
parent
4d88f649
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
lib/gitlab/bitbucket_import/importer.rb
lib/gitlab/bitbucket_import/importer.rb
+7
-2
No files found.
lib/gitlab/bitbucket_import/importer.rb
View file @
c19d5ac1
...
@@ -149,16 +149,21 @@ module Gitlab
...
@@ -149,16 +149,21 @@ module Gitlab
description
+=
@formatter
.
author_line
(
pull_request
.
author
)
unless
find_user_id
(
pull_request
.
author
)
description
+=
@formatter
.
author_line
(
pull_request
.
author
)
unless
find_user_id
(
pull_request
.
author
)
description
+=
pull_request
.
description
description
+=
pull_request
.
description
source_branch_sha
=
pull_request
.
source_branch_sha
target_branch_sha
=
pull_request
.
target_branch_sha
source_branch_sha
=
project
.
repository
.
commit
(
source_branch_sha
)
&
.
sha
||
source_branch_sha
target_branch_sha
=
project
.
repository
.
commit
(
target_branch_sha
)
&
.
sha
||
target_branch_sha
merge_request
=
project
.
merge_requests
.
create!
(
merge_request
=
project
.
merge_requests
.
create!
(
iid:
pull_request
.
iid
,
iid:
pull_request
.
iid
,
title:
pull_request
.
title
,
title:
pull_request
.
title
,
description:
description
,
description:
description
,
source_project:
project
,
source_project:
project
,
source_branch:
pull_request
.
source_branch_name
,
source_branch:
pull_request
.
source_branch_name
,
source_branch_sha:
pull_request
.
source_branch_sha
,
source_branch_sha:
source_branch_sha
,
target_project:
project
,
target_project:
project
,
target_branch:
pull_request
.
target_branch_name
,
target_branch:
pull_request
.
target_branch_name
,
target_branch_sha:
pull_request
.
target_branch_sha
,
target_branch_sha:
target_branch_sha
,
state:
pull_request
.
state
,
state:
pull_request
.
state
,
author_id:
gitlab_user_id
(
project
,
pull_request
.
author
),
author_id:
gitlab_user_id
(
project
,
pull_request
.
author
),
assignee_id:
nil
,
assignee_id:
nil
,
...
...
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