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

4 files changed, 7 insertions, 90 deletions

diff --git a/app/views/projects/ci/lints/_create.html.haml b/app/views/projects/ci/lints/_create.html.haml
deleted file mode 100644
index 4b7cda0ef57..00000000000
--- a/app/views/projects/ci/lints/_create.html.haml
+++ /dev/null
@@ -1,51 +0,0 @@
-- if @result.valid?
-  .bs-callout.bs-callout-success
-    %p
-      %b= _("Status:")
-      = _("syntax is correct")
-
-  = render "projects/ci/lints/lint_warnings", warnings: @result.warnings
-
-  .table-holder
-    %table.table.table-bordered
-      %thead
-        %tr
-          %th= _("Parameter")
-          %th= _("Value")
-      %tbody
-        - @result.jobs.each do |job|
-          %tr
-            %td #{job[:stage].capitalize} Job - #{job[:name]}
-            %td
-              %pre= job[:before_script].to_a.join('\n')
-              %pre= job[:script].to_a.join('\n')
-              %pre= job[:after_script].to_a.join('\n')
-              %br
-              %b= _("Tag list:")
-              = job[:tag_list].to_a.join(", ")
-              - unless @dry_run
-                %br
-                %b= _("Only policy:")
-                = job[:only].to_a.join(", ")
-                %br
-                %b= _("Except policy:")
-                = job[:except].to_a.join(", ")
-              %br
-              %b= _("Environment:")
-              = job[:environment]
-              %br
-              %b= _("When:")
-              = job[:when]
-              - if job[:allow_failure]
-                %b= _("Allowed to fail")
-
-- else
-  .bs-callout.bs-callout-danger
-    %p
-      %b= _("Status:")
-      = _("syntax is incorrect")
-  %pre
-    - @result.errors.each do |message|
-      %p= message
-
-  = render "projects/ci/lints/lint_warnings", warnings: @result.warnings
diff --git a/app/views/projects/ci/lints/_lint_warnings.html.haml b/app/views/projects/ci/lints/_lint_warnings.html.haml
deleted file mode 100644
index 90db65e6c27..00000000000
--- a/app/views/projects/ci/lints/_lint_warnings.html.haml
+++ /dev/null
@@ -1,10 +0,0 @@
-- if warnings
-  - total_warnings = warnings.length
-  - message = warning_header(total_warnings)
-
-  - if warnings.any?
-    .bs-callout.bs-callout-warning
-      %details
-        %summary.gl-mb-2= message
-        - warnings.each do |warning|
-          = markdown(warning)
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') } }
diff --git a/app/views/projects/ci/pipeline_editor/show.html.haml b/app/views/projects/ci/pipeline_editor/show.html.haml
new file mode 100644
index 00000000000..0e032f2575e
--- /dev/null
+++ b/app/views/projects/ci/pipeline_editor/show.html.haml
@@ -0,0 +1,6 @@
+- page_title s_('Pipelines|Pipeline Editor')
+
+#js-pipeline-editor{ data: { "ci-config-path": @project.ci_config_path_or_default,
+  "project-path" => @project.full_path,
+  "default-branch" => @project.default_branch,
+} }