summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-05-14 16:32:23 +0000
committerFilipa Lacerda <filipa@gitlab.com>2017-05-14 16:32:23 +0000
commitf70075b6d09e8cdf0898afb3d8696b881228c363 (patch)
treeaeb75e6c16dfb2644fe4482a57cc0bed4757b53f /app
parent361b2b135ff020cb628f1d0617e191a8bde620bf (diff)
parent5655ff0feeaa76524dafbac982ec96cbf18e9e20 (diff)
downloadgitlab-ce-f70075b6d09e8cdf0898afb3d8696b881228c363.tar.gz
Merge branch 'use-common-vue-for-pipeline-schedule-bundles' into 'master'
Ensure schedule_form and schedules_index both utilize common_vue bundle See merge request !11274
Diffstat (limited to 'app')
-rw-r--r--app/views/projects/pipeline_schedules/_form.html.haml3
-rw-r--r--app/views/projects/pipeline_schedules/index.html.haml4
2 files changed, 4 insertions, 3 deletions
diff --git a/app/views/projects/pipeline_schedules/_form.html.haml b/app/views/projects/pipeline_schedules/_form.html.haml
index 2d272a93b98..d6f4f1a206c 100644
--- a/app/views/projects/pipeline_schedules/_form.html.haml
+++ b/app/views/projects/pipeline_schedules/_form.html.haml
@@ -1,5 +1,6 @@
- content_for :page_specific_javascripts do
- = page_specific_javascript_bundle_tag('schedule_form')
+ = webpack_bundle_tag 'common_vue'
+ = webpack_bundle_tag 'schedule_form'
= form_for [@project.namespace.becomes(Namespace), @project, @schedule], as: :schedule, html: { id: "new-pipeline-schedule-form", class: "form-horizontal js-pipeline-schedule-form" } do |f|
= form_errors(@schedule)
diff --git a/app/views/projects/pipeline_schedules/index.html.haml b/app/views/projects/pipeline_schedules/index.html.haml
index a597d745e33..25c52175e3d 100644
--- a/app/views/projects/pipeline_schedules/index.html.haml
+++ b/app/views/projects/pipeline_schedules/index.html.haml
@@ -1,5 +1,6 @@
- content_for :page_specific_javascripts do
- = page_specific_javascript_bundle_tag('schedules_index')
+ = webpack_bundle_tag 'common_vue'
+ = webpack_bundle_tag 'schedules_index'
- @no_container = true
- page_title "Pipeline Schedules"
@@ -21,4 +22,3 @@
- else
.light-well
.nothing-here-block No schedules
-