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
3bf08845
Commit
3bf08845
authored
Apr 26, 2017
by
Nick Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a failing rubocop spec on master
parent
a5444564
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
16 deletions
+17
-16
lib/github/import.rb
lib/github/import.rb
+17
-16
No files found.
lib/github/import.rb
View file @
3bf08845
...
...
@@ -171,22 +171,23 @@ module Github
begin
restore_branches
(
pull_request
)
author_id
=
user_id
(
pull_request
.
author
,
project
.
creator_id
)
merge_request
.
iid
=
pull_request
.
iid
merge_request
.
title
=
pull_request
.
title
merge_request
.
description
=
format_description
(
pull_request
.
description
,
pull_request
.
author
)
merge_request
.
source_project
=
pull_request
.
source_project
merge_request
.
source_branch
=
pull_request
.
source_branch_name
merge_request
.
source_branch_sha
=
pull_request
.
source_branch_sha
merge_request
.
target_project
=
pull_request
.
target_project
merge_request
.
target_branch
=
pull_request
.
target_branch_name
merge_request
.
target_branch_sha
=
pull_request
.
target_branch_sha
merge_request
.
state
=
pull_request
.
state
merge_request
.
milestone_id
=
milestone_id
(
pull_request
.
milestone
)
merge_request
.
author_id
=
author_id
merge_request
.
assignee_id
=
user_id
(
pull_request
.
assignee
)
merge_request
.
created_at
=
pull_request
.
created_at
merge_request
.
updated_at
=
pull_request
.
updated_at
merge_request
.
attributes
=
{
iid:
pull_request
.
iid
,
title:
pull_request
.
title
,
description:
format_description
(
pull_request
.
description
,
pull_request
.
author
),
source_project:
pull_request
.
source_project
,
source_branch:
pull_request
.
source_branch_name
,
source_branch_sha:
pull_request
.
source_branch_sha
,
target_project:
pull_request
.
target_project
,
target_branch:
pull_request
.
target_branch_name
,
target_branch_sha:
pull_request
.
target_branch_sha
,
state:
pull_request
.
state
,
milestone_id:
milestone_id
(
pull_request
.
milestone
),
author_id:
user_id
(
pull_request
.
author
,
project
.
creator_id
),
assignee_id:
user_id
(
pull_request
.
assignee
),
created_at:
pull_request
.
created_at
,
updated_at:
pull_request
.
updated_at
}
merge_request
.
save!
(
validate:
false
)
merge_request
.
merge_request_diffs
.
create
...
...
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