summaryrefslogtreecommitdiff
path: root/lib/gitlab/ci/config
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2017-02-28 16:48:39 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-03-06 10:04:04 +0100
commitbe039d22d71afa7c8b2635cd8820b8b4566d15b8 (patch)
tree2bbd17d43614ae93ed5bca9cb901fb788ce33b37 /lib/gitlab/ci/config
parent6cc02e084f96d7d3cb56870cbe545c67e6a564bb (diff)
downloadgitlab-ce-be039d22d71afa7c8b2635cd8820b8b4566d15b8.tar.gz
Make manual actions blocking
Diffstat (limited to 'lib/gitlab/ci/config')
-rw-r--r--lib/gitlab/ci/config/entry/job.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab/ci/config/entry/job.rb b/lib/gitlab/ci/config/entry/job.rb
index 7f7662f2776..69e2a8a2563 100644
--- a/lib/gitlab/ci/config/entry/job.rb
+++ b/lib/gitlab/ci/config/entry/job.rb
@@ -104,6 +104,10 @@ module Gitlab
(before_script_value.to_a + script_value.to_a).join("\n")
end
+ def allow_failure
+ super || self.when == 'manual'
+ end
+
private
def inherit!(deps)