diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2016-07-19 16:24:40 +0300 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2016-07-19 16:24:40 +0300 |
commit | 87604ed6ceb7d088dd4ebbc20185fe6ef46180c5 (patch) | |
tree | f856fdec8195f1484453b9d86d9947fb43d4cf58 /app/models/ci/pipeline.rb | |
parent | 08b9532e376eae369cd04d9f86ea560acfd19ed0 (diff) | |
parent | e57c0c89f082e98f0fa0f3bd5ab0778c7304c41e (diff) |
Merge branch 'master' into artifacts-from-ref-and-build-name-api
* master: (23 commits)
Add CHANGELOG entry [ci skip]
CHANGELOG item
Added redirect_to_referer to login link on issues
Simplify entities for branches and tags API
Added Rake task for tracking deployments
Return the number of marked todos
Use local_assigns
Use `humanize`
Improve code design
Remove unused create_pipeline_service_spec.rb
Add notice implementation
Make manual actions to work with master code
Use `capitalize` instead of `titleize` for manual actions
Mark builds with manual actions as skipped
Fix rubocop offenses
Update build fixtures to include manual actions
Improve manual actions code and add model, service and feature tests
Rename playable_actions to manual_actions
Add implementation of manual actions
Position commit icons closer to branch name/tag/sha; add min-width to pipeline actions cell
...
Diffstat (limited to 'app/models/ci/pipeline.rb')
-rw-r--r-- | app/models/ci/pipeline.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index f5b4124d1ee..fab91bdae5a 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -77,6 +77,10 @@ module Ci !tag? end + def manual_actions + builds.latest.manual_actions + end + def retryable? builds.latest.any? do |build| build.failed? && build.retryable? |