diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-06-24 17:38:13 +0300 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-06-24 17:40:45 +0300 |
| commit | 8164acebd7adfd3cc3e80f9750a4ce88e28399ce (patch) | |
| tree | b582a35ca80fd80f3a00816a7aaeb76d4f57c788 /app | |
| parent | aec639d33b404ed4e1e587ea181cd65af5e5314e (diff) | |
| download | gitlab-ci-8164acebd7adfd3cc3e80f9750a4ce88e28399ce.tar.gz | |
warning when .gitlab-ci.yml not found
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/commit.rb | 2 | ||||
| -rw-r--r-- | app/services/create_commit_service.rb | 3 | ||||
| -rw-r--r-- | app/views/commits/show.html.haml | 4 |
3 files changed, 6 insertions, 3 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? diff --git a/app/services/create_commit_service.rb b/app/services/create_commit_service.rb index df678d4..f9d16a5 100644 --- a/app/services/create_commit_service.rb +++ b/app/services/create_commit_service.rb @@ -3,7 +3,6 @@ class CreateCommitService before_sha = params[:before] sha = params[:checkout_sha] || params[:after] origin_ref = params[:ref] - yaml_config = params[:ci_yaml_file] || project.generated_yaml_config unless origin_ref && sha.present? return false @@ -34,7 +33,7 @@ class CreateCommitService repository: params[:repository], commits: params[:commits], total_commits_count: params[:total_commits_count], - ci_yaml_file: yaml_config + ci_yaml_file: params[:ci_yaml_file] } } diff --git a/app/views/commits/show.html.haml b/app/views/commits/show.html.haml index 76b491f..b1b586c 100644 --- a/app/views/commits/show.html.haml +++ b/app/views/commits/show.html.haml @@ -45,6 +45,10 @@ %ul - @commit.yaml_errors.split(",").each do |error| %li= error + +- unless @commit.push_data[:ci_yaml_file] + .bs-callout.bs-callout-warning + \.gitlab-ci.yml not found in this commit %h3 Status |