diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-01-31 11:42:06 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-01-31 11:42:06 +0000 |
commit | 5ac590677f4518d40070ba797874439dcf4a6227 (patch) | |
tree | 5d3eadce64fb91771fa3a22c758a4635ea63c3d0 /lib | |
parent | 810979f02b72f68b805b2e0c4a067b36e77334b6 (diff) | |
parent | 10178af1fd30e97dd65d11bba1e640aa7dc5bbbd (diff) | |
download | gitlab-ce-5ac590677f4518d40070ba797874439dcf4a6227.tar.gz |
Merge branch '25910-convert-manual-action-icons-to-svg-to-propperly-position-them' into 'master'
Convert pipeline action icons to svg to have them propperly positioned
Closes #25910
See merge request !8766
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/ci/status/build/cancelable.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/ci/status/build/play.rb | 6 | ||||
-rw-r--r-- | lib/gitlab/ci/status/build/retryable.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/ci/status/build/stop.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/ci/status/core.rb | 3 |
5 files changed, 4 insertions, 11 deletions
diff --git a/lib/gitlab/ci/status/build/cancelable.rb b/lib/gitlab/ci/status/build/cancelable.rb index a979fe7d573..67bbc3c4849 100644 --- a/lib/gitlab/ci/status/build/cancelable.rb +++ b/lib/gitlab/ci/status/build/cancelable.rb @@ -10,7 +10,7 @@ module Gitlab end def action_icon - 'ban' + 'icon_action_cancel' end def action_path diff --git a/lib/gitlab/ci/status/build/play.rb b/lib/gitlab/ci/status/build/play.rb index 1bf949c96dd..0f4b7b24cef 100644 --- a/lib/gitlab/ci/status/build/play.rb +++ b/lib/gitlab/ci/status/build/play.rb @@ -26,17 +26,13 @@ module Gitlab end def action_icon - 'play' + 'icon_action_play' end def action_title 'Play' end - def action_class - 'ci-play-icon' - end - def action_path play_namespace_project_build_path(subject.project.namespace, subject.project, diff --git a/lib/gitlab/ci/status/build/retryable.rb b/lib/gitlab/ci/status/build/retryable.rb index 8e38d6a8523..6b362af7634 100644 --- a/lib/gitlab/ci/status/build/retryable.rb +++ b/lib/gitlab/ci/status/build/retryable.rb @@ -10,7 +10,7 @@ module Gitlab end def action_icon - 'refresh' + 'icon_action_retry' end def action_title diff --git a/lib/gitlab/ci/status/build/stop.rb b/lib/gitlab/ci/status/build/stop.rb index e1dfdb76d41..90401cad0d2 100644 --- a/lib/gitlab/ci/status/build/stop.rb +++ b/lib/gitlab/ci/status/build/stop.rb @@ -26,7 +26,7 @@ module Gitlab end def action_icon - 'stop' + 'icon_action_stop' end def action_title diff --git a/lib/gitlab/ci/status/core.rb b/lib/gitlab/ci/status/core.rb index 73b6ab5a635..3dd2b9e01f6 100644 --- a/lib/gitlab/ci/status/core.rb +++ b/lib/gitlab/ci/status/core.rb @@ -42,9 +42,6 @@ module Gitlab raise NotImplementedError end - def action_class - end - def action_path raise NotImplementedError end |