Commit 6fc1aba4 authored by Robert Speicher's avatar Robert Speicher
Browse files

Merge branch 'fix/ci-linter-sequence-validations' into 'master'

Allow subsequent validations in CI Linter

Closes #5851

See merge request !2368
parents 5dad714d cdd3a806
......@@ -33,6 +33,7 @@ v 8.4.0 (unreleased)
- Add file finder feature in tree view (Kyungchul Shin)
- Ajax filter by message for commits page
- API: Add support for deleting a tag via the API (Robert Schilling)
- Allow subsequent validations in CI Linter
v 8.3.3 (unreleased)
- Preserve CE behavior with JIRA integration by only calling API if URL is set
......@@ -6,11 +6,13 @@ def show
def create
if params[:content].blank?
@content = params[:content]
if @content.blank?
@status = false
@error = "Please provide content of .gitlab-ci.yml"
@config_processor = params[:content]
@config_processor =
@stages = @config_processor.stages
@builds = @config_processor.builds
@status = true
......@@ -4,12 +4,12 @@
= form_tag ci_lint_path, method: :post do
= label_tag :content, 'Content of .gitlab-ci.yml', class: 'control-label text-nowrap'
= label_tag(:content, 'Content of .gitlab-ci.yml', class: 'control-label text-nowrap')
= text_area_tag :content, nil, class: 'form-control span1', rows: 7, require: true
= text_area_tag(:content, @content, class: 'form-control span1', rows: 7, require: true)
= submit_tag 'Validate', class: 'btn btn-success submit-yml'
= submit_tag('Validate', class: 'btn btn-success submit-yml')
......@@ -35,5 +35,13 @@
expect(page).to have_content('Error: Please provide content of .gitlab-ci.yml')
describe 'YAML revalidate' do
let(:yaml_content) { 'my yaml content' }
it 'loads previous YAML content after validation' do
expect(page).to have_field('content', with: 'my yaml content', type: 'textarea')
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment