diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-10 15:07:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-10 15:07:47 +0300 |
| commit | 96b0c1245c93585a8b0fe23e22306d32ff4e4905 (patch) | |
| tree | d2904751e1a2529e8239381ce747339cdbf5116c /app/controllers/projects/ci | |
| parent | 0ba3a054d2190094ffda1ebe3aa53ffc5b92247d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/ci')
| -rw-r--r-- | app/controllers/projects/ci/lints_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/ci/lints_controller.rb b/app/controllers/projects/ci/lints_controller.rb index 812420e9708..b50afa12da0 100644 --- a/app/controllers/projects/ci/lints_controller.rb +++ b/app/controllers/projects/ci/lints_controller.rb @@ -10,8 +10,8 @@ class Projects::Ci::LintsController < Projects::ApplicationController @content = params[:content] result = Gitlab::Ci::YamlProcessor.new_with_validation_errors(@content, yaml_processor_options) - @error = result.errors.join(', ') - @status = result.valid? + @status = result.valid? + @errors = result.errors if result.valid? @config_processor = result.content |