diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-01-17 11:03:09 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-01-17 11:03:09 +0300 |
| commit | ceb2a76876de68d705ab6d9ae677fb90fc8bab3e (patch) | |
| tree | deb8d2e6bccdc899e37e9bfa69f4635db8d9653c /lib | |
| parent | 73cb6c3e717f3aa4979003552e00c715c052241a (diff) | |
| parent | 6cdc711b6cb1a4a947496506e4b81208d3a61f82 (diff) | |
Merge branch 'fix/gb/improve-manual-action-tooltips' into 'master'
Fix running manual action tooltip
Closes #41418
See merge request gitlab-org/gitlab-ce!16489
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ci/status/build/action.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/gitlab/ci/status/build/action.rb b/lib/gitlab/ci/status/build/action.rb index 45fd0d4aa07..6c9125647ad 100644 --- a/lib/gitlab/ci/status/build/action.rb +++ b/lib/gitlab/ci/status/build/action.rb @@ -2,6 +2,9 @@ module Gitlab module Ci module Status module Build + ## + # Extended status for playable manual actions. + # class Action < Status::Extended def label if has_action? @@ -12,7 +15,7 @@ module Gitlab end def self.matches?(build, user) - build.action? + build.playable? end end end |