4 files changed, 11 insertions, 7 deletions
diff --git a/lib/gitlab/badge/coverage/template.rb b/lib/gitlab/badge/coverage/template.rb
index 6b78825aefd..1b985f83b22 100644
--- a/lib/gitlab/badge/coverage/template.rb
+++ b/lib/gitlab/badge/coverage/template.rb
@@ -25,7 +25,7 @@ module Gitlab
         end
 
         def key_text
-          if @key_text && @key_text.size <= MAX_KEY_SIZE
+          if @key_text && @key_text.size <= MAX_KEY_TEXT_SIZE
             @key_text
           else
             @entity.to_s
@@ -37,7 +37,7 @@ module Gitlab
         end
 
         def key_width
-          if @key_width && @key_width.between?(1, MAX_KEY_SIZE)
+          if @key_width && @key_width.between?(1, MAX_KEY_WIDTH)
             @key_width
           else
             62
diff --git a/lib/gitlab/badge/pipeline/status.rb b/lib/gitlab/badge/pipeline/status.rb
index 17f179f027d..f061ba22688 100644
--- a/lib/gitlab/badge/pipeline/status.rb
+++ b/lib/gitlab/badge/pipeline/status.rb
@@ -12,6 +12,7 @@ module Gitlab
         def initialize(project, ref, opts: {})
           @project = project
           @ref = ref
+          @ignore_skipped = Gitlab::Utils.to_boolean(opts[:ignore_skipped], default: false)
           @customization = {
             key_width: opts[:key_width].to_i,
             key_text: opts[:key_text]
@@ -26,9 +27,11 @@ module Gitlab
 
         # rubocop: disable CodeReuse/ActiveRecord
         def status
-          @project.ci_pipelines
+          pipelines = @project.ci_pipelines
             .where(sha: @sha)
-            .latest_status(@ref) || 'unknown'
+
+          relation = @ignore_skipped ? pipelines.without_statuses([:skipped]) : pipelines
+          relation.latest_status(@ref) || 'unknown'
         end
         # rubocop: enable CodeReuse/ActiveRecord
 
diff --git a/lib/gitlab/badge/pipeline/template.rb b/lib/gitlab/badge/pipeline/template.rb
index 781897fab4b..af8e318395b 100644
--- a/lib/gitlab/badge/pipeline/template.rb
+++ b/lib/gitlab/badge/pipeline/template.rb
@@ -29,7 +29,7 @@ module Gitlab
         end
 
         def key_text
-          if @key_text && @key_text.size <= MAX_KEY_SIZE
+          if @key_text && @key_text.size <= MAX_KEY_TEXT_SIZE
             @key_text
           else
             @entity.to_s
@@ -41,7 +41,7 @@ module Gitlab
         end
 
         def key_width
-          if @key_width && @key_width.between?(1, MAX_KEY_SIZE)
+          if @key_width && @key_width.between?(1, MAX_KEY_WIDTH)
             @key_width
           else
             62
diff --git a/lib/gitlab/badge/template.rb b/lib/gitlab/badge/template.rb
index 97103e3f42c..9ac8f1c17f2 100644
--- a/lib/gitlab/badge/template.rb
+++ b/lib/gitlab/badge/template.rb
@@ -6,7 +6,8 @@ module Gitlab
     # Abstract template class for badges
     #
     class Template
-      MAX_KEY_SIZE = 128
+      MAX_KEY_TEXT_SIZE = 64
+      MAX_KEY_WIDTH = 512
 
       def initialize(badge)
         @entity = badge.entity