summaryrefslogtreecommitdiff
path: root/app/models/ci/commit.rb
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2015-09-18 17:28:09 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2015-09-20 20:46:14 +0200
commit71a5d5a036a34a9b2cd257e6e6a105095ec89241 (patch)
tree86973bf7248485df3b6c7095303fd49dfd5d5599 /app/models/ci/commit.rb
parenta6f2caf7a2e0c18338f943623d61c4cd8b9fbd0c (diff)
downloadgitlab-ce-71a5d5a036a34a9b2cd257e6e6a105095ec89241.tar.gz
Fail builds if no .gitlab-ci.yml is found
Diffstat (limited to 'app/models/ci/commit.rb')
-rw-r--r--app/models/ci/commit.rb2
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