diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-19 12:49:54 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-19 12:49:54 +0000 |
| commit | 61e7453e0465ceb631d3e8445429cfed7c1449d3 (patch) | |
| tree | f20fabfca0a5d7cdf694f1df69c88788b3f8eb65 /spec/lib | |
| parent | ad14c1bf85f716ed698e8802161de74f462a106c (diff) | |
| parent | 72229c375fb3efe9dd28c0bf98f0df7696d99fc2 (diff) | |
| download | gitlab-ce-61e7453e0465ceb631d3e8445429cfed7c1449d3.tar.gz | |
Merge branch 'manual-actions' into 'master'
Add support for manual CI actions
## What does this MR do?
This implements a `when: manual` which allows a jobs to be marked as manual actions.
Manual actions have to be explicitly executed by developers.
## What are the relevant issue numbers?
This is to solve: https://gitlab.com/gitlab-org/gitlab-ce/issues/17010
See merge request !5297
Diffstat (limited to 'spec/lib')
| -rw-r--r-- | spec/lib/ci/gitlab_ci_yaml_processor_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb index ad6587b4c25..d20fd4ab7dd 100644 --- a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb +++ b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb @@ -1141,7 +1141,7 @@ EOT config = YAML.dump({ rspec: { script: "test", when: 1 } }) expect do GitlabCiYamlProcessor.new(config, path) - end.to raise_error(GitlabCiYamlProcessor::ValidationError, "rspec job: when parameter should be on_success, on_failure or always") + end.to raise_error(GitlabCiYamlProcessor::ValidationError, "rspec job: when parameter should be on_success, on_failure, always or manual") end it "returns errors if job artifacts:name is not an a string" do |