summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-05-12 22:57:50 +0100
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-05-15 16:34:04 +0100
commit7e7f266139ca9f4721f18e85e99e9796fd87eca3 (patch)
tree7155903852ebbe65d1bbd019cdaef2c3c93537a0 /app/views
parente2ffb8698751769879e21626c79f9c607a630bf5 (diff)
downloadgitlab-ce-7e7f266139ca9f4721f18e85e99e9796fd87eca3.tar.gz
Add test.js and test.css to disable animations during testing and include these in _head when testingdisable-css-and-jquery-animations-for-capybara
Diffstat (limited to 'app/views')
-rw-r--r--app/views/layouts/_head.html.haml2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index afcc2b6e4f3..9e354987401 100644
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -27,6 +27,7 @@
= stylesheet_link_tag "application", media: "all"
= stylesheet_link_tag "print", media: "print"
+ = stylesheet_link_tag "test", media: "all" if Rails.env.test?
= Gon::Base.render_data
@@ -34,6 +35,7 @@
= webpack_bundle_tag "common"
= webpack_bundle_tag "main"
= webpack_bundle_tag "raven" if current_application_settings.clientside_sentry_enabled
+ = webpack_bundle_tag "test" if Rails.env.test?
- if content_for?(:page_specific_javascripts)
= yield :page_specific_javascripts