summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/_show.html.haml
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2016-11-03 16:38:54 -0500
committerMike Greiling <mike@pixelcog.com>2017-01-10 12:30:38 -0600
commitfe964cc235ed22a5d013d5874284763b698aba7c (patch)
tree5529dd7d9deb13d511d37f7a8fed33de15aa6d7c /app/views/projects/merge_requests/_show.html.haml
parent55f291e8ceae6d3d432039f72f6935c62fb2a872 (diff)
downloadgitlab-ce-fe964cc235ed22a5d013d5874284763b698aba7c.tar.gz
migrate all javascript asset bundles and require syntax
Diffstat (limited to 'app/views/projects/merge_requests/_show.html.haml')
-rw-r--r--app/views/projects/merge_requests/_show.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index 1f63803c24e..97618984bb4 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -3,7 +3,7 @@
- page_description @merge_request.description
- page_card_attributes @merge_request.card_attributes
- content_for :page_specific_javascripts do
- = page_specific_javascript_tag('diff_notes/diff_notes_bundle.js')
+ = page_specific_javascript_bundle_tag('diff_notes')
.merge-request{ 'data-url' => merge_request_path(@merge_request) }
= render "projects/merge_requests/show/mr_title"