diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-02-27 16:51:12 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-02-27 16:51:12 -0600 |
| commit | 94d5dd3b7bf5fb922458cec7659754164e8182c6 (patch) | |
| tree | 4d00ce69d971e40a3a8288821bc7d7026da33fd5 /app/views/projects/merge_requests | |
| parent | 0be4a77d0012613f960c4177f53101c46de2899c (diff) | |
| download | gitlab-ce-94d5dd3b7bf5fb922458cec7659754164e8182c6.tar.gz | |
remove merge_conflicts bundle in favor of pages directory entry point
Diffstat (limited to 'app/views/projects/merge_requests')
| -rw-r--r-- | app/views/projects/merge_requests/conflicts.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/conflicts/show.html.haml | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/app/views/projects/merge_requests/conflicts.html.haml b/app/views/projects/merge_requests/conflicts.html.haml index 2a2e57027be..a6e2565a485 100644 --- a/app/views/projects/merge_requests/conflicts.html.haml +++ b/app/views/projects/merge_requests/conflicts.html.haml @@ -1,7 +1,5 @@ - page_title "Merge Conflicts", "#{@merge_request.title} (#{@merge_request.to_reference}", "Merge Requests" - content_for :page_specific_javascripts do - = webpack_bundle_tag('common_vue') - = webpack_bundle_tag('merge_conflicts') = page_specific_javascript_tag('lib/ace.js') = render "projects/merge_requests/mr_title" diff --git a/app/views/projects/merge_requests/conflicts/show.html.haml b/app/views/projects/merge_requests/conflicts/show.html.haml index 2a2e57027be..a6e2565a485 100644 --- a/app/views/projects/merge_requests/conflicts/show.html.haml +++ b/app/views/projects/merge_requests/conflicts/show.html.haml @@ -1,7 +1,5 @@ - page_title "Merge Conflicts", "#{@merge_request.title} (#{@merge_request.to_reference}", "Merge Requests" - content_for :page_specific_javascripts do - = webpack_bundle_tag('common_vue') - = webpack_bundle_tag('merge_conflicts') = page_specific_javascript_tag('lib/ace.js') = render "projects/merge_requests/mr_title" |