Add latest changes from gitlab-org/gitlab@master

3 files changed, 17 insertions, 27 deletions

diff --git a/app/views/projects/pipeline_schedules/edit.html.haml b/app/views/projects/pipeline_schedules/edit.html.haml
index 3f843ce6aec..642b458eea6 100644
--- a/app/views/projects/pipeline_schedules/edit.html.haml
+++ b/app/views/projects/pipeline_schedules/edit.html.haml
@@ -7,7 +7,4 @@
   = _("Edit Pipeline Schedule")
 %hr
 
-- if Feature.enabled?(:pipeline_schedules_vue, @project)
-  #pipeline-schedules-form-edit{ data: { full_path: @project.full_path } }
-- else
-  = render "form"
+= render "form"
diff --git a/app/views/projects/pipeline_schedules/index.html.haml b/app/views/projects/pipeline_schedules/index.html.haml
index 6c7b4b2f320..a0412650b3a 100644
--- a/app/views/projects/pipeline_schedules/index.html.haml
+++ b/app/views/projects/pipeline_schedules/index.html.haml
@@ -3,25 +3,21 @@
 - add_page_specific_style 'page_bundles/pipeline_schedules'
 
 #pipeline-schedules-callout{ data: { docs_url: help_page_path('ci/pipelines/schedules'), illustration_url: image_path('illustrations/pipeline_schedule_callout.svg') } }
+.top-area
+  - schedule_path_proc = ->(scope) { pipeline_schedules_path(@project, scope: scope) }
+  = render "tabs", schedule_path_proc: schedule_path_proc, all_schedules: @all_schedules, scope: @scope
 
-- if Feature.enabled?(:pipeline_schedules_vue, @project)
-  #pipeline-schedules-app{ data: { full_path: @project.full_path } }
-- else
-  .top-area
-    - schedule_path_proc = ->(scope) { pipeline_schedules_path(@project, scope: scope) }
-    = render "tabs", schedule_path_proc: schedule_path_proc, all_schedules: @all_schedules, scope: @scope
-
-    - if can?(current_user, :create_pipeline_schedule, @project)
-      .nav-controls
-        = link_to new_project_pipeline_schedule_path(@project), class: 'btn gl-button btn-confirm' do
-          %span= _('New schedule')
+  - if can?(current_user, :create_pipeline_schedule, @project)
+    .nav-controls
+      = link_to new_project_pipeline_schedule_path(@project), class: 'btn gl-button btn-confirm' do
+        %span= _('New schedule')
 
-  - if @schedules.present?
-    %ul.content-list
-      = render partial: "table"
-  - else
-    = render Pajamas::CardComponent.new(card_options: { class: 'bg-light gl-mt-3 gl-text-center' }) do |c|
-      - c.body do
-        = _("No schedules")
+- if @schedules.present?
+  %ul.content-list
+    = render partial: "table"
+- else
+  = render Pajamas::CardComponent.new(card_options: { class: 'bg-light gl-mt-3 gl-text-center' }) do |c|
+    - c.body do
+      = _("No schedules")
 
-  #pipeline-take-ownership-modal
+#pipeline-take-ownership-modal
diff --git a/app/views/projects/pipeline_schedules/new.html.haml b/app/views/projects/pipeline_schedules/new.html.haml
index d3757d0e339..3b4acf5b8c5 100644
--- a/app/views/projects/pipeline_schedules/new.html.haml
+++ b/app/views/projects/pipeline_schedules/new.html.haml
@@ -8,7 +8,4 @@
 %h1.page-title.gl-font-size-h-display
   = _("Schedule a new pipeline")
 
-- if Feature.enabled?(:pipeline_schedules_vue, @project)
-  #pipeline-schedules-form-new{ data: { full_path: @project.full_path } }
-- else
-  = render "form"
+= render "form"