Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
gpt
large_projects
gitlabhq1
Commits
70d15ae1
Commit
70d15ae1
authored
8 years ago
by
Douglas Barbosa Alexandre
Browse files
Options
Download
Email Patches
Plain Diff
Fix Rubocop offenses
parent
44954c50
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
lib/github/import.rb
lib/github/import.rb
+6
-2
No files found.
lib/github/import.rb
View file @
70d15ae1
...
...
@@ -160,8 +160,7 @@ module Github
next
unless
merge_request
.
new_record?
&&
pull_request
.
valid?
begin
restore_source_branch
(
pull_request
)
unless
pull_request
.
source_branch_exists?
restore_target_branch
(
pull_request
)
unless
pull_request
.
target_branch_exists?
restore_branches
(
pull_request
)
author_id
=
user_id
(
pull_request
.
author
,
project
.
creator_id
)
merge_request
.
iid
=
pull_request
.
iid
...
...
@@ -310,6 +309,11 @@ module Github
end
end
def
restore_branches
(
pull_request
)
restore_source_branch
(
pull_request
)
unless
pull_request
.
source_branch_exists?
restore_target_branch
(
pull_request
)
unless
pull_request
.
target_branch_exists?
end
def
restore_source_branch
(
pull_request
)
repository
.
create_branch
(
pull_request
.
source_branch_name
,
pull_request
.
source_branch_sha
)
end
...
...
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