diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-05-11 17:05:54 +0000 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2017-05-18 14:40:26 +0000 |
| commit | 91b4f8e30237b252059052686375f0ef7d7ec9c7 (patch) | |
| tree | a78949c3d928aa4fe07f52f649601ecefe8e86ac /app/views/projects/merge_requests/index.html.haml | |
| parent | b6fdb7d232e2cfb725fabb62c08a92ef008f3c1b (diff) | |
| download | gitlab-ce-91b4f8e30237b252059052686375f0ef7d7ec9c7.tar.gz | |
Merge branch 'use-common-vue-for-filtered-search' into 'master'
Ensure filtered_search utilizes common_vue bundle
See merge request !11273
Diffstat (limited to 'app/views/projects/merge_requests/index.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/index.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml index 6bf0035e051..502220232a1 100644 --- a/app/views/projects/merge_requests/index.html.haml +++ b/app/views/projects/merge_requests/index.html.haml @@ -8,7 +8,8 @@ = render 'projects/last_push' - content_for :page_specific_javascripts do - = page_specific_javascript_bundle_tag('filtered_search') + = webpack_bundle_tag 'common_vue' + = webpack_bundle_tag 'filtered_search' - if @project.merge_requests.exists? %div{ class: container_class } |