3 files changed, 9 insertions, 74 deletions
diff --git a/app/views/ci/lints/_create.html.haml b/app/views/ci/lints/_create.html.haml
deleted file mode 100644
index 30bf1384b22..00000000000
--- a/app/views/ci/lints/_create.html.haml
+++ /dev/null
@@ -1,45 +0,0 @@
-- if @status
-  %p
-    %b Status:
-    syntax is correct
-    %i.fa.fa-ok.correct-syntax
-
-  .table-holder
-    %table.table.table-bordered
-      %thead
-        %tr
-          %th Parameter
-          %th Value
-      %tbody
-        - @stages.each do |stage|
-          - @builds.select { |build| build[:stage] == stage }.each do |build|
-            %tr
-              %td #{stage.capitalize} Job - #{build[:name]}
-              %td
-                %pre= build[:commands]
-
-                %br
-                %b Tag list:
-                = build[:tag_list].to_a.join(", ")
-                %br
-                %b Only policy:
-                = @jobs[build[:name].to_sym][:only].to_a.join(", ")
-                %br
-                %b Except policy:
-                = @jobs[build[:name].to_sym][:except].to_a.join(", ")
-                %br
-                %b Environment:
-                = build[:environment]
-                %br
-                %b When:
-                = build[:when]
-                - if build[:allow_failure]
-                  %b Allowed to fail
-
-- else
-  %p
-    %b Status:
-    syntax is incorrect
-    %i.fa.fa-remove.incorrect-syntax
-  %b Error:
-  = @error
diff --git a/app/views/ci/lints/show.html.haml b/app/views/ci/lints/show.html.haml
index 3c0881caa06..22f149d1caa 100644
--- a/app/views/ci/lints/show.html.haml
+++ b/app/views/ci/lints/show.html.haml
@@ -1,27 +1,9 @@
-- page_title "CI Lint"
-- page_description "Validate your GitLab CI configuration file"
-- content_for :library_javascripts do
-  = page_specific_javascript_tag('lib/ace.js')
-
-%h2 Check your .gitlab-ci.yml
-
-.ci-linter
-  .row
-    = form_tag ci_lint_path, method: :post do
-      .form-group
-        .col-sm-12
-          .file-holder
-            .js-file-title.file-title.clearfix
-              Content of .gitlab-ci.yml
-            #ci-editor.ci-editor= @content
-          = text_area_tag(:content, @content, class: 'hidden form-control span1', rows: 7, require: true)
-      .col-sm-12
-        .pull-left.prepend-top-10
-          = submit_tag('Validate', class: 'btn btn-success submit-yml')
-        .pull-right.prepend-top-10
-          = button_tag('Clear', type: 'button', class: 'btn btn-default clear-yml')
-
-  .row.prepend-top-20
-    .col-sm-12
-      .results.ci-template
-        = render partial: 'create' if defined?(@status)
+.row.empty-state
+  .col-xs-12
+    .svg-content
+      = image_tag 'illustrations/feature_moved.svg'
+  .col-xs-12
+    .text-content.text-center
+      %h4= _("GitLab CI Linter has been moved")
+      %p
+        = _("To validate your GitLab CI configurations, go to 'CI/CD → Pipelines' inside your project, and click on the 'CI Lint' button.")
diff --git a/app/views/ci/variables/_variable_row.html.haml b/app/views/ci/variables/_variable_row.html.haml
index 5d4229c80af..440623b34f5 100644
--- a/app/views/ci/variables/_variable_row.html.haml
+++ b/app/views/ci/variables/_variable_row.html.haml
@@ -43,7 +43,5 @@
           %span.toggle-icon
             = sprite_icon('status_success_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-checked')
             = sprite_icon('status_failed_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-unchecked')
-      -# EE-specific start
-      -# EE-specific end
   %button.js-row-remove-button.ci-variable-row-remove-button{ type: 'button', 'aria-label': s_('CiVariables|Remove variable row') }
     = icon('minus-circle')