diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-02-15 16:50:20 -0600 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-02-15 16:50:20 -0600 |
| commit | 1c2d283d506f2ceb4777622837fffe381e34cb9d (patch) | |
| tree | 2a41129f3f749113c4ba780e484227e23c01d148 /app/views/projects/merge_requests | |
| parent | efdde042a3299668957d16200a407b9daae52301 (diff) | |
| download | gitlab-ce-1c2d283d506f2ceb4777622837fffe381e34cb9d.tar.gz | |
Add dispatcher imports for bundles used in merge request show path
Diffstat (limited to 'app/views/projects/merge_requests')
| -rw-r--r-- | app/views/projects/merge_requests/_how_to_merge.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show.html.haml | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/app/views/projects/merge_requests/_how_to_merge.html.haml b/app/views/projects/merge_requests/_how_to_merge.html.haml index 917ec7fdbda..54a661040ea 100644 --- a/app/views/projects/merge_requests/_how_to_merge.html.haml +++ b/app/views/projects/merge_requests/_how_to_merge.html.haml @@ -1,6 +1,3 @@ -- content_for :page_specific_javascripts do - = webpack_bundle_tag('how_to_merge') - #modal_merge_info.modal .modal-dialog .modal-content diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml index 8740c6895df..b0fa6c2bd7b 100644 --- a/app/views/projects/merge_requests/show.html.haml +++ b/app/views/projects/merge_requests/show.html.haml @@ -4,9 +4,6 @@ - page_title "#{@merge_request.title} (#{@merge_request.to_reference})", "Merge Requests" - page_description @merge_request.description - page_card_attributes @merge_request.card_attributes -- content_for :page_specific_javascripts do - = webpack_bundle_tag('common_vue') - = webpack_bundle_tag('diff_notes') .merge-request{ data: { mr_action: j(params[:tab].presence || 'show'), url: merge_request_path(@merge_request, format: :json), project_path: project_path(@merge_request.project) } } = render "projects/merge_requests/mr_title" |