Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

1 files changed, 1 insertions, 29 deletions

diff --git a/app/views/projects/ci/lints/show.html.haml b/app/views/projects/ci/lints/show.html.haml
index 64f250bd607..feccea6cfc0 100644
--- a/app/views/projects/ci/lints/show.html.haml
+++ b/app/views/projects/ci/lints/show.html.haml
@@ -3,32 +3,4 @@
 
 %h2.pt-3.pb-3= _("Validate your GitLab CI configuration")
 
-- if Feature.enabled?(:ci_lint_vue, @project)
-  #js-ci-lint{ data: { endpoint: project_ci_lint_path(@project), help_page_path: help_page_path('ci/lint', anchor: 'pipeline-simulation') } }
-
-- else
-  .project-ci-linter
-    = form_tag project_ci_lint_path(@project), method: :post, class: 'js-ci-lint-form' do
-      .row
-        .col-sm-12
-          .file-holder
-            .js-file-title.file-title.clearfix
-              = _("Contents of .gitlab-ci.yml")
-            .file-editor.code
-              .js-edit-mode-pane.qa-editor#editor{ data: { 'editor-loading': true } }<
-                %pre.editor-loading-content= params[:content]
-          = text_area_tag(:content, @content, class: 'hidden form-control span1', rows: 7, require: true)
-        .col-sm-12
-          .float-left.gl-mt-3
-            = submit_tag(_('Validate'), class: 'btn btn-success submit-yml')
-            - if Gitlab::Ci::Features.lint_creates_pipeline_with_dry_run?(@project)
-              = check_box_tag(:dry_run, 'true', params[:dry_run])
-              = label_tag(:dry_run, _('Simulate a pipeline created for the default branch'))
-              = link_to sprite_icon('question-o'), help_page_path('ci/lint', anchor: 'pipeline-simulation'), target: '_blank', rel: 'noopener noreferrer'
-          .float-right.prepend-top-10
-            = button_tag(_('Clear'), type: 'button', class: 'btn btn-default clear-yml')
-
-    .row.prepend-top-20
-      .col-sm-12
-        .results.project-ci-template
-          = render partial: 'create' if defined?(@result)
+#js-ci-lint{ data: { endpoint: project_ci_lint_path(@project), pipeline_simulation_help_page_path: help_page_path('ci/lint', anchor: 'pipeline-simulation') , lint_help_page_path: help_page_path('ci/lint', anchor: 'validate-basic-logic-and-syntax') } }