Commit e2be17b7 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '31458-fix-rubocop-failure' into 'master'

Fix a failing Rubocop rule on master

Closes #31458

See merge request !10947
parents b5526a2d 1d0a0b9a
...@@ -172,23 +172,27 @@ module Github ...@@ -172,23 +172,27 @@ module Github
restore_branches(pull_request) restore_branches(pull_request)
author_id = user_id(pull_request.author, project.creator_id) author_id = user_id(pull_request.author, project.creator_id)
merge_request.iid = pull_request.iid description = format_description(pull_request.description, pull_request.author)
merge_request.title = pull_request.title
merge_request.description = format_description(pull_request.description, pull_request.author) merge_request.attributes = {
merge_request.source_project = pull_request.source_project iid: pull_request.iid,
merge_request.source_branch = pull_request.source_branch_name title: pull_request.title,
merge_request.source_branch_sha = pull_request.source_branch_sha description: description,
merge_request.target_project = pull_request.target_project source_project: pull_request.source_project,
merge_request.target_branch = pull_request.target_branch_name source_branch: pull_request.source_branch_name,
merge_request.target_branch_sha = pull_request.target_branch_sha source_branch_sha: pull_request.source_branch_sha,
merge_request.state = pull_request.state target_project: pull_request.target_project,
merge_request.milestone_id = milestone_id(pull_request.milestone) target_branch: pull_request.target_branch_name,
merge_request.author_id = author_id target_branch_sha: pull_request.target_branch_sha,
merge_request.assignee_id = user_id(pull_request.assignee) state: pull_request.state,
merge_request.created_at = pull_request.created_at milestone_id: milestone_id(pull_request.milestone),
merge_request.updated_at = pull_request.updated_at author_id: author_id,
merge_request.save!(validate: false) 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 merge_request.merge_request_diffs.create
# Fetch review comments # Fetch review comments
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment