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

Minor refactor

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'
end
def short_sha(length = 7)
sha.to_s[0..length]
def short_sha
Commit.truncate_sha(sha)
end
private

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

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