diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /lib/gitlab/badge/coverage | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) | |
download | gitlab-ce-8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781.tar.gz |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'lib/gitlab/badge/coverage')
-rw-r--r-- | lib/gitlab/badge/coverage/report.rb | 10 | ||||
-rw-r--r-- | lib/gitlab/badge/coverage/template.rb | 14 |
2 files changed, 19 insertions, 5 deletions
diff --git a/lib/gitlab/badge/coverage/report.rb b/lib/gitlab/badge/coverage/report.rb index 15cccc6f287..0df6e858bf4 100644 --- a/lib/gitlab/badge/coverage/report.rb +++ b/lib/gitlab/badge/coverage/report.rb @@ -7,12 +7,16 @@ module Gitlab # Test coverage report badge # class Report < Badge::Base - attr_reader :project, :ref, :job + attr_reader :project, :ref, :job, :customization - def initialize(project, ref, job = nil) + def initialize(project, ref, opts: { job: nil }) @project = project @ref = ref - @job = job + @job = opts[:job] + @customization = { + key_width: opts[:key_width].to_i, + key_text: opts[:key_text] + } @pipeline = @project.ci_pipelines.latest_successful_for_ref(@ref) end diff --git a/lib/gitlab/badge/coverage/template.rb b/lib/gitlab/badge/coverage/template.rb index 817dc28f84a..6b78825aefd 100644 --- a/lib/gitlab/badge/coverage/template.rb +++ b/lib/gitlab/badge/coverage/template.rb @@ -20,10 +20,16 @@ module Gitlab def initialize(badge) @entity = badge.entity @status = badge.status + @key_text = badge.customization.dig(:key_text) + @key_width = badge.customization.dig(:key_width) end def key_text - @entity.to_s + if @key_text && @key_text.size <= MAX_KEY_SIZE + @key_text + else + @entity.to_s + end end def value_text @@ -31,7 +37,11 @@ module Gitlab end def key_width - 62 + if @key_width && @key_width.between?(1, MAX_KEY_SIZE) + @key_width + else + 62 + end end def value_width |