Add Pipeline Schedules that supersedes experimental Trigger Schedule

3 files changed, 0 insertions, 30 deletions

diff --git a/app/views/projects/triggers/_form.html.haml b/app/views/projects/triggers/_form.html.haml
index 70d654fa9a0..5f708b3a2ed 100644
--- a/app/views/projects/triggers/_form.html.haml
+++ b/app/views/projects/triggers/_form.html.haml
@@ -8,26 +8,4 @@
   .form-group
     = f.label :key, "Description", class: "label-light"
     = f.text_field :description, class: "form-control", required: true, title: 'Trigger description is required.', placeholder: "Trigger description"
-    - if @trigger.persisted?
-      %hr
-      = f.fields_for :trigger_schedule do |schedule_fields|
-        = schedule_fields.hidden_field :id
-        .form-group
-          .checkbox
-            = schedule_fields.label :active do
-              = schedule_fields.check_box :active
-              %strong Schedule trigger (experimental)
-            .help-block
-              If checked, this trigger will be executed periodically according to cron and timezone.
-              = link_to icon('question-circle'), help_page_path('ci/triggers/README', anchor: 'using-scheduled-triggers')
-        .form-group
-          = schedule_fields.label :cron, "Cron", class: "label-light"
-          = schedule_fields.text_field :cron, class: "form-control", title: 'Cron specification is required.', placeholder: "0 1 * * *"
-        .form-group
-          = schedule_fields.label :cron, "Timezone", class: "label-light"
-          = schedule_fields.text_field :cron_timezone, class: "form-control", title: 'Timezone is required.', placeholder: "UTC"
-        .form-group
-          = schedule_fields.label :ref, "Branch or tag", class: "label-light"
-          = schedule_fields.text_field :ref, class: "form-control", title: 'Branch or tag is required.', placeholder: "master"
-          .help-block Existing branch name, tag
   = f.submit btn_text, class: "btn btn-save"
diff --git a/app/views/projects/triggers/_index.html.haml b/app/views/projects/triggers/_index.html.haml
index 84e945ee0df..cc74e50a5e3 100644
--- a/app/views/projects/triggers/_index.html.haml
+++ b/app/views/projects/triggers/_index.html.haml
@@ -22,8 +22,6 @@
                 %th
                   %strong Last used
                 %th
-                  %strong Next run at
-                %th
               = render partial: 'projects/triggers/trigger', collection: @triggers, as: :trigger
         - else
           %p.settings-message.text-center.append-bottom-default
diff --git a/app/views/projects/triggers/_trigger.html.haml b/app/views/projects/triggers/_trigger.html.haml
index ebd91a8e2af..9b5f63ae81a 100644
--- a/app/views/projects/triggers/_trigger.html.haml
+++ b/app/views/projects/triggers/_trigger.html.haml
@@ -29,12 +29,6 @@
     - else
       Never
 
-  %td
-    - if trigger.trigger_schedule&.active?
-      = trigger.trigger_schedule.real_next_run
-    - else
-      Never
-
   %td.text-right.trigger-actions
     - take_ownership_confirmation = "By taking ownership you will bind this trigger to your user account. With this the trigger will have access to all your projects as if it was you. Are you sure?"
     - revoke_trigger_confirmation = "By revoking a trigger you will break any processes making use of it. Are you sure?"