summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2016-11-21 15:40:58 -0600
committerMike Greiling <mike@pixelcog.com>2017-01-10 12:30:39 -0600
commit11e9f32d1be94d9216416c730c0b72effed1aa73 (patch)
tree1293f04b67387c746fd1a283748a3088f1372732
parenta2c1f2e0ea5ce1030ecfe4fa821b9268773baac5 (diff)
downloadgitlab-ce-11e9f32d1be94d9216416c730c0b72effed1aa73.tar.gz
fix rubocop complaint about ambiguous splat operator
-rw-r--r--app/helpers/javascript_helper.rb2
-rw-r--r--app/views/layouts/_head.html.haml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/javascript_helper.rb b/app/helpers/javascript_helper.rb
index d9c8c70076b..64284910d4d 100644
--- a/app/helpers/javascript_helper.rb
+++ b/app/helpers/javascript_helper.rb
@@ -3,6 +3,6 @@ module JavascriptHelper
javascript_include_tag asset_path(js), { "data-turbolinks-track" => true }
end
def page_specific_javascript_bundle_tag(js)
- javascript_include_tag *webpack_asset_paths(js), { "data-turbolinks-track" => true }
+ javascript_include_tag(*webpack_asset_paths(js), { "data-turbolinks-track" => true })
end
end
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index d260e2133f2..0d9f838e804 100644
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -28,7 +28,7 @@
= stylesheet_link_tag "application", media: "all"
= stylesheet_link_tag "print", media: "print"
- = javascript_include_tag *webpack_asset_paths("application")
+ = javascript_include_tag(*webpack_asset_paths("application"))
- if content_for?(:page_specific_javascripts)
= yield :page_specific_javascripts