diff options
| author | Nick Thomas <nick@gitlab.com> | 2017-07-20 17:37:18 +0100 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2017-07-20 17:37:18 +0100 |
| commit | 9af75704e9c82334a3ed4bb78fb2d97604e38d4b (patch) | |
| tree | 34f308b7230bad0eb2ea2cf15e6ef6c2ea80f500 /lib/ci | |
| parent | 61a7ff7f201393904efddf43c92c749ada697acf (diff) | |
| parent | 7f78a78a36a4341680a71afa5a12a1f4d4876c66 (diff) | |
| download | gitlab-ce-9af75704e9c82334a3ed4bb78fb2d97604e38d4b.tar.gz | |
Merge remote-tracking branch 'ce/master' into ce-to-ee-2017-07-20
Diffstat (limited to 'lib/ci')
| -rw-r--r-- | lib/ci/gitlab_ci_yaml_processor.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb index cf3a0336792..3a4911b23b0 100644 --- a/lib/ci/gitlab_ci_yaml_processor.rb +++ b/lib/ci/gitlab_ci_yaml_processor.rb @@ -83,7 +83,8 @@ module Ci before_script: job[:before_script], script: job[:script], after_script: job[:after_script], - environment: job[:environment] + environment: job[:environment], + retry: job[:retry] }.compact } end |