summaryrefslogtreecommitdiff
path: root/app/models/ci/build.rb
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-07-19 21:24:40 +0800
committerLin Jen-Shin <godfat@godfat.org>2016-07-19 21:24:40 +0800
commit87604ed6ceb7d088dd4ebbc20185fe6ef46180c5 (patch)
treef856fdec8195f1484453b9d86d9947fb43d4cf58 /app/models/ci/build.rb
parent08b9532e376eae369cd04d9f86ea560acfd19ed0 (diff)
parente57c0c89f082e98f0fa0f3bd5ab0778c7304c41e (diff)
downloadgitlab-ce-87604ed6ceb7d088dd4ebbc20185fe6ef46180c5.tar.gz
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/build.rb')
-rw-r--r--app/models/ci/build.rb24
1 files changed, 24 insertions, 0 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 65dfe4f0190..20492c54729 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -18,6 +18,7 @@ module Ci
scope :latest_successful_with_artifacts, ->() do
with_artifacts.success.order(id: :desc)
end
+ scope :manual_actions, ->() { where(when: :manual) }
mount_uploader :artifacts_file, ArtifactUploader
mount_uploader :artifacts_metadata, ArtifactUploader
@@ -94,6 +95,29 @@ module Ci
end
end
+ def manual?
+ self.when == 'manual'
+ end
+
+ def other_actions
+ pipeline.manual_actions.where.not(id: self)
+ end
+
+ def playable?
+ project.builds_enabled? && commands.present? && manual?
+ end
+
+ def play(current_user = nil)
+ # Try to queue a current build
+ if self.queue
+ self.update(user: current_user)
+ self
+ else
+ # Otherwise we need to create a duplicate
+ Ci::Build.retry(self, current_user)
+ end
+ end
+
def retryable?
project.builds_enabled? && commands.present? && complete?
end