diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-21 10:49:18 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-21 10:49:18 +0300 |
| commit | 8bb3215d543db5a7905c1322cf584276a4f58145 (patch) | |
| tree | 70f85ecbc621ca7bb898dd7657d8eb1002a420af /app/models | |
| parent | 46173ec8ce167c6ecb6ae9bf3b41bb3d3968f948 (diff) | |
| parent | 8671343b65810b983d2c8ea37b3123abd620c093 (diff) | |
Merge branch 'fail-ci-builds-without-yml' into 'master'
Fail ci builds without yml
Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/2551
See merge request !1349
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/ci/commit.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/ci/commit.rb b/app/models/ci/commit.rb index 23cd47dfe37..f102d0a7679 100644 --- a/app/models/ci/commit.rb +++ b/app/models/ci/commit.rb @@ -236,7 +236,7 @@ module Ci end def config_processor - @config_processor ||= Ci::GitlabCiYamlProcessor.new(push_data[:ci_yaml_file] || project.generated_yaml_config) + @config_processor ||= Ci::GitlabCiYamlProcessor.new(push_data[:ci_yaml_file]) rescue Ci::GitlabCiYamlProcessor::ValidationError => e save_yaml_error(e.message) nil |