diff options
| author | Mike Greiling <mike@pixelcog.com> | 2016-10-28 03:22:02 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-01-06 10:21:02 -0600 |
| commit | 55f291e8ceae6d3d432039f72f6935c62fb2a872 (patch) | |
| tree | 0251e33d29241731ad16ae8a9681fa0863782840 /app/views/layouts/_head.html.haml | |
| parent | 31bd36845ba1c18404f029f85b6a0f841c1c390c (diff) | |
| download | gitlab-ce-55f291e8ceae6d3d432039f72f6935c62fb2a872.tar.gz | |
replace application.js sprockets output with webpack-generated equivalent
Diffstat (limited to 'app/views/layouts/_head.html.haml')
| -rw-r--r-- | app/views/layouts/_head.html.haml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index 87aadfb1bf5..d260e2133f2 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -28,8 +28,7 @@ = stylesheet_link_tag "application", media: "all" = stylesheet_link_tag "print", media: "print" - = javascript_include_tag "application" - = javascript_include_tag *webpack_asset_paths("bundle") + = javascript_include_tag *webpack_asset_paths("application") - if content_for?(:page_specific_javascripts) = yield :page_specific_javascripts |