diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-07-20 10:44:01 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-07-20 10:44:01 +0200 |
| commit | 795c9f2241db7967d03f7792431fe65013a5dd0f (patch) | |
| tree | 220a27d93fca929b01980abd6f1d77759859351d /lib/gitlab/ci | |
| parent | bb8bf6427d80cb4858318a44e395a2d1cd9115b7 (diff) | |
| parent | 79b02e40e5842540ceff4454f6c2c51f13fc081c (diff) | |
| download | gitlab-ce-795c9f2241db7967d03f7792431fe65013a5dd0f.tar.gz | |
Merge branch 'master' into refactor/ci-config-move-job-entries
* master: (321 commits)
Fix the Sentry spam from CSP violations by disabling it.
Limit git rev-list output count to one in forced push check
Ensure Owners are included in the scope for authorized_projects
Fix alignment of icons on project page
Fix ci_status_helper_spec to look for new SVGs
use 2.0.5, actually (2.0.4 was a bad release)
upgrade rouge to 2.0.4
Fix help page paths to make sure shortcuts and the UI help page work.
fixes an issue cause by a bad merge
Vertically align status icon within table
Add new icons for every CI status
Add global style for running icon
Align running icon in merge request
Add new running icon; add a bunch of styles to get svg to match existing fa icons
Improve code design
Fix broken builds_for_ref
Move when tests before to make it no conflict with manual-actions
Use value of `yaml_variables` and `when` from config_processor if undefined
Add CHANGELOG entry
CHANGELOG item
...
Conflicts:
lib/ci/gitlab_ci_yaml_processor.rb
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
Diffstat (limited to 'lib/gitlab/ci')
| -rw-r--r-- | lib/gitlab/ci/config/node/job.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/ci/config/node/job.rb b/lib/gitlab/ci/config/node/job.rb index 464abd4d2d8..aea9fef8229 100644 --- a/lib/gitlab/ci/config/node/job.rb +++ b/lib/gitlab/ci/config/node/job.rb @@ -25,9 +25,9 @@ module Gitlab validates :tags, array_of_strings: true validates :allow_failure, boolean: true validates :when, - inclusion: { in: %w[on_success on_failure always], - message: 'should be on_success, on_failure ' \ - 'or always' } + inclusion: { in: %w[on_success on_failure always manual], + message: 'should be on_success, on_failure, ' \ + 'always or manual' } validates :environment, type: { with: String, |