diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-06-24 14:43:11 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-06-24 14:43:11 +0000 |
| commit | a6454082c456d5824012444be0977c34b0d51a87 (patch) | |
| tree | b582a35ca80fd80f3a00816a7aaeb76d4f57c788 /app/models/commit.rb | |
| parent | aec639d33b404ed4e1e587ea181cd65af5e5314e (diff) | |
| parent | 8164acebd7adfd3cc3e80f9750a4ce88e28399ce (diff) | |
| download | gitlab-ci-a6454082c456d5824012444be0977c34b0d51a87.tar.gz | |
Merge branch 'show_warning_about_yaml' into 'master'
Warning when .gitlab-ci.yml not found
https://dev.gitlab.org/gitlab/gitlab-ci/issues/295
See merge request !164
Diffstat (limited to 'app/models/commit.rb')
| -rw-r--r-- | app/models/commit.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index 46900ab..215afdd 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -215,7 +215,7 @@ class Commit < ActiveRecord::Base end def config_processor - @config_processor ||= GitlabCiYamlProcessor.new(push_data[:ci_yaml_file]) + @config_processor ||= GitlabCiYamlProcessor.new(push_data[:ci_yaml_file] || project.generated_yaml_config) end def skip_ci? |