Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-11-04 01:28:47 +0300
committerFatih Acet <acetfatih@gmail.com>2016-11-04 01:28:47 +0300
commit630c40b9a2b14c96254a21bea23835e28ae6140a (patch)
tree30b4dc97805be456da710cabfa37621be4a4a597 /app/helpers
parent257075e43b88056fa38ca157f3552d3fa87653b2 (diff)
parent2471b01b11d638116b63c75ab324a3872f0c8245 (diff)
Merge branch '22914-mini-graph-icons' into 'master'
Add new icon for skipped builds; show created state in mini graph ![Screen_Shot_2016-11-03_at_1.31.02_PM](/uploads/69be86d59f5939329cd869804e86cb87/Screen_Shot_2016-11-03_at_1.31.02_PM.png) ![Screen_Shot_2016-11-03_at_1.30.46_PM](/uploads/0d568ad94e3f072beb0728b402aa695a/Screen_Shot_2016-11-03_at_1.30.46_PM.png) Closes #22914 See merge request !7276
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/ci_status_helper.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/helpers/ci_status_helper.rb b/app/helpers/ci_status_helper.rb
index b7f48630bd4..fabe5c1f63a 100644
--- a/app/helpers/ci_status_helper.rb
+++ b/app/helpers/ci_status_helper.rb
@@ -47,8 +47,10 @@ module CiStatusHelper
'icon_play'
when 'created'
'icon_status_created'
+ when 'skipped'
+ 'icon_status_skipped'
else
- 'icon_status_cancel'
+ 'icon_status_canceled'
end
custom_icon(icon_name)