diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-12-06 12:16:52 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-12-06 12:16:52 +0100 |
| commit | e94f378b619849c46bf6b736ea9c61c19956b57f (patch) | |
| tree | e824b7b3da39baea98e87e25d943f6ccbfa3abf6 | |
| parent | 79e132fad4a3428c1d65e877be65d094a559649c (diff) | |
| download | gitlab-ce-e94f378b619849c46bf6b736ea9c61c19956b57f.tar.gz | |
Improve support for icons in new detailed statuses
| -rw-r--r-- | app/views/projects/pipelines/_info.html.haml | 1 | ||||
| -rw-r--r-- | lib/gitlab/ci/status/core.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/ci/status/pipeline/success_with_warnings.rb | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/app/views/projects/pipelines/_info.html.haml b/app/views/projects/pipelines/_info.html.haml index bbfaa6391a1..229bdfb0e8d 100644 --- a/app/views/projects/pipelines/_info.html.haml +++ b/app/views/projects/pipelines/_info.html.haml @@ -2,7 +2,6 @@ .header-main-content = ci_status_with_icon(@pipeline.detailed_status) %strong Pipeline ##{@commit.pipelines.last.id} - #{ci_label_for_status(@pipeline.detailed_status)}, triggered #{time_ago_with_tooltip(@commit.authored_date)} by = author_avatar(@commit, size: 24) = commit_author_link(@commit) diff --git a/lib/gitlab/ci/status/core.rb b/lib/gitlab/ci/status/core.rb index 10e04d5be03..ce4108fdcf2 100644 --- a/lib/gitlab/ci/status/core.rb +++ b/lib/gitlab/ci/status/core.rb @@ -30,7 +30,7 @@ module Gitlab # phasing legacy satuses out. # def to_s - self.class.name.demodulize.downcase + self.class.name.demodulize.downcase.underscore end def has_details? diff --git a/lib/gitlab/ci/status/pipeline/success_with_warnings.rb b/lib/gitlab/ci/status/pipeline/success_with_warnings.rb index 97dfba81ff5..4b040d60df8 100644 --- a/lib/gitlab/ci/status/pipeline/success_with_warnings.rb +++ b/lib/gitlab/ci/status/pipeline/success_with_warnings.rb @@ -17,6 +17,10 @@ module Gitlab 'icon_status_warning' end + def to_s + 'success_with_warnings' + end + def self.matches?(pipeline) pipeline.success? && pipeline.has_warnings? end |