diff options
Diffstat (limited to 'lib/gitlab/github_import/representation/pull_request.rb')
| -rw-r--r-- | lib/gitlab/github_import/representation/pull_request.rb | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/lib/gitlab/github_import/representation/pull_request.rb b/lib/gitlab/github_import/representation/pull_request.rb index 0ccc4bfaed3..be192762e05 100644 --- a/lib/gitlab/github_import/representation/pull_request.rb +++ b/lib/gitlab/github_import/representation/pull_request.rb @@ -13,18 +13,16 @@ module Gitlab :source_branch_sha, :target_branch, :target_branch_sha, :milestone_number, :author, :assignee, :created_at, :updated_at, :merged_at, :source_repository_id, - :target_repository_id, :source_repository_owner + :target_repository_id, :source_repository_owner, :merged_by # Builds a PR from a GitHub API response. # # issue - An instance of `Sawyer::Resource` containing the PR details. def self.from_api_response(pr) - assignee = - if pr.assignee - Representation::User.from_api_response(pr.assignee) - end - + assignee = Representation::User.from_api_response(pr.assignee) if pr.assignee user = Representation::User.from_api_response(pr.user) if pr.user + merged_by = Representation::User.from_api_response(pr.merged_by) if pr.merged_by + hash = { iid: pr.number, title: pr.title, @@ -42,7 +40,8 @@ module Gitlab assignee: assignee, created_at: pr.created_at, updated_at: pr.updated_at, - merged_at: pr.merged_at + merged_at: pr.merged_at, + merged_by: merged_by } new(hash) @@ -57,8 +56,8 @@ module Gitlab # Assignees are optional so we only convert it from a Hash if one was # set. - hash[:assignee] &&= Representation::User - .from_json_hash(hash[:assignee]) + hash[:assignee] &&= Representation::User.from_json_hash(hash[:assignee]) + hash[:merged_by] &&= Representation::User.from_json_hash(hash[:merged_by]) new(hash) end |