Commit 3bf08845 authored by Nick Thomas's avatar Nick Thomas

Fix a failing rubocop spec on master

parent a5444564
...@@ -171,22 +171,23 @@ module Github ...@@ -171,22 +171,23 @@ module Github
begin begin
restore_branches(pull_request) restore_branches(pull_request)
author_id = user_id(pull_request.author, project.creator_id) merge_request.attributes = {
merge_request.iid = pull_request.iid iid: pull_request.iid,
merge_request.title = pull_request.title title: pull_request.title,
merge_request.description = format_description(pull_request.description, pull_request.author) description: format_description(pull_request.description, pull_request.author),
merge_request.source_project = pull_request.source_project source_project: pull_request.source_project,
merge_request.source_branch = pull_request.source_branch_name source_branch: pull_request.source_branch_name,
merge_request.source_branch_sha = pull_request.source_branch_sha source_branch_sha: pull_request.source_branch_sha,
merge_request.target_project = pull_request.target_project target_project: pull_request.target_project,
merge_request.target_branch = pull_request.target_branch_name target_branch: pull_request.target_branch_name,
merge_request.target_branch_sha = pull_request.target_branch_sha target_branch_sha: pull_request.target_branch_sha,
merge_request.state = pull_request.state state: pull_request.state,
merge_request.milestone_id = milestone_id(pull_request.milestone) milestone_id: milestone_id(pull_request.milestone),
merge_request.author_id = author_id author_id: user_id(pull_request.author, project.creator_id),
merge_request.assignee_id = user_id(pull_request.assignee) assignee_id: user_id(pull_request.assignee),
merge_request.created_at = pull_request.created_at created_at: pull_request.created_at,
merge_request.updated_at = pull_request.updated_at updated_at: pull_request.updated_at
}
merge_request.save!(validate: false) merge_request.save!(validate: false)
merge_request.merge_request_diffs.create merge_request.merge_request_diffs.create
......
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