diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-01-11 19:09:09 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-01-11 19:09:09 +0000 |
| commit | 6fc1aba4a3153e8b0d1bf16be1075012c0cb8459 (patch) | |
| tree | 70b7591e093004c0598793d3ee38b7bd599b6c88 /app/controllers | |
| parent | 5dad714df6a95413d04c954577a5627234647648 (diff) | |
| parent | cdd3a806825db480b9cc9dfd36f3cf58c84e0f61 (diff) | |
| download | gitlab-ce-6fc1aba4a3153e8b0d1bf16be1075012c0cb8459.tar.gz | |
Merge branch 'fix/ci-linter-sequence-validations' into 'master'
Allow subsequent validations in CI Linter
Closes #5851
See merge request !2368
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/ci/lints_controller.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/controllers/ci/lints_controller.rb b/app/controllers/ci/lints_controller.rb index e782a51e7eb..a7af3cb8345 100644 --- a/app/controllers/ci/lints_controller.rb +++ b/app/controllers/ci/lints_controller.rb @@ -6,11 +6,13 @@ module Ci end def create - if params[:content].blank? + @content = params[:content] + + if @content.blank? @status = false @error = "Please provide content of .gitlab-ci.yml" else - @config_processor = Ci::GitlabCiYamlProcessor.new params[:content] + @config_processor = Ci::GitlabCiYamlProcessor.new(@content) @stages = @config_processor.stages @builds = @config_processor.builds @status = true |