summaryrefslogtreecommitdiff
path: root/lib/github/representation/pull_request.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-10-05 10:57:34 +0200
committerRémy Coutable <remy@rymai.me>2017-10-05 11:05:45 +0200
commit7833d3fb29592daa774124dedca692b921e1545c (patch)
tree76b40df374e2bf6567861be4e79bf8cb64801b56 /lib/github/representation/pull_request.rb
parentf50b95b00790794184243062e3cbc9095b8b839d (diff)
downloadgitlab-ce-7833d3fb29592daa774124dedca692b921e1545c.tar.gz
Improve & simplify GitHub's representation classes
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'lib/github/representation/pull_request.rb')
-rw-r--r--lib/github/representation/pull_request.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/github/representation/pull_request.rb b/lib/github/representation/pull_request.rb
index 9baa7af4ffa..0171179bb0f 100644
--- a/lib/github/representation/pull_request.rb
+++ b/lib/github/representation/pull_request.rb
@@ -1,8 +1,8 @@
module Github
module Representation
class PullRequest < Representation::Issuable
- delegate :user, :repo, :ref, :sha, to: :source_branch, prefix: true
- delegate :user, :exists?, :repo, :ref, :sha, :short_sha, to: :target_branch, prefix: true
+ delegate :sha, to: :source_branch, prefix: true
+ delegate :sha, to: :target_branch, prefix: true
def source_project
project
@@ -11,7 +11,7 @@ module Github
def source_branch_name
# Mimic the "user:branch" displayed in the MR widget,
# i.e. "Request to merge rymai:add-external-mounts into master"
- cross_project? ? "#{source_branch_user}:#{source_branch_ref}" : source_branch_ref
+ cross_project? ? "#{source_branch.user}:#{source_branch.ref}" : source_branch.ref
end
def target_project
@@ -19,7 +19,7 @@ module Github
end
def target_branch_name
- target_branch_ref
+ target_branch.ref
end
def state
@@ -62,9 +62,9 @@ module Github
end
def cross_project?
- return true if source_branch_repo.nil?
+ return true unless source_branch.repo?
- source_branch_repo.id != target_branch_repo.id
+ source_branch.repo.id != target_branch.repo.id
end
end
end