kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Minor refactor

Browse source
This commit is contained in:
Gabriel Mazetto 2017-03-26 03:16:27 +02:00
parent c8273ba858
commit 3c75ee2823
2 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/gitlab/github_import/branch_formatter.rb
View file

@ -15,8 +15,8 @@ module Gitlab
raw_data.user&.login || 'unknown' raw_data.user&.login || 'unknown'
end end
def short_sha(length = 7) def short_sha
sha.to_s[0..length] Commit.truncate_sha(sha)
end end
private private

15
lib/gitlab/github_import/pull_request_formatter.rb
View file

@ -37,13 +37,12 @@ module Gitlab
end end
def source_branch_name def source_branch_name
@source_branch_name ||= begin @source_branch_name ||=
if cross_project? if cross_project? || !source_branch_exists?
source_branch_name_prefixed source_branch_name_prefixed
else else
source_branch_exists? ? source_branch_ref : source_branch_name_prefixed source_branch_ref
end end
end
end end
def source_branch_name_prefixed def source_branch_name_prefixed
@ -51,9 +50,7 @@ module Gitlab
end end
def source_branch_exists? def source_branch_exists?
return false if cross_project? !cross_project? && source_branch.exists?
source_branch.exists?
end end
def target_branch def target_branch
@ -61,9 +58,7 @@ module Gitlab
end end
def target_branch_name def target_branch_name
@target_branch_name ||= begin @target_branch_name ||= target_branch_exists? ? target_branch_ref : target_branch_name_prefixed
target_branch_exists? ? target_branch_ref : target_branch_name_prefixed
end
end end
def target_branch_name_prefixed def target_branch_name_prefixed