From ce35dcbc81116fa4803fc7bfcd35a3585695c07a Mon Sep 17 00:00:00 2001 From: Gabriel Mazetto Date: Wed, 8 Mar 2017 19:16:39 +0100 Subject: Refactor some code --- lib/gitlab/github_import/pull_request_formatter.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/gitlab/github_import/pull_request_formatter.rb b/lib/gitlab/github_import/pull_request_formatter.rb index e1224d03498..28812fd0cb9 100644 --- a/lib/gitlab/github_import/pull_request_formatter.rb +++ b/lib/gitlab/github_import/pull_request_formatter.rb @@ -38,8 +38,8 @@ module Gitlab def source_branch_name @source_branch_name ||= begin - if source_branch.repo.id != target_branch.repo.id - "pull/#{number}/#{source_branch.repo.full_name}/#{source_branch_ref}" + if cross_project? + "pull/#{number}/#{source_branch_repo.full_name}/#{source_branch_ref}" else source_branch_exists? ? source_branch_ref : "pull/#{number}/#{source_branch_ref}" end @@ -56,6 +56,10 @@ module Gitlab end end + def cross_project? + source_branch.repo.id != target_branch.repo.id + end + private def state -- cgit v1.2.1