diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-13 00:57:50 +0300 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-15 18:34:04 +0300 |
| commit | 7e7f266139ca9f4721f18e85e99e9796fd87eca3 (patch) | |
| tree | 7155903852ebbe65d1bbd019cdaef2c3c93537a0 /config | |
| parent | e2ffb8698751769879e21626c79f9c607a630bf5 (diff) | |
Add test.js and test.css to disable animations during testing and include these in _head when testing
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 1 | ||||
| -rw-r--r-- | config/webpack.config.js | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index bf3fb7a18c1..95ba6774916 100644 --- a/config/application.rb +++ b/config/application.rb @@ -106,6 +106,7 @@ module Gitlab config.assets.precompile << "xterm/xterm.css" config.assets.precompile << "lib/ace.js" config.assets.precompile << "vendor/assets/fonts/*" + config.assets.precompile << "test.css" # Version of your assets, change this if you want to expire all your assets config.assets.version = '1.0' diff --git a/config/webpack.config.js b/config/webpack.config.js index 5d5a42512b1..37ec1611adf 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -63,6 +63,7 @@ var config = { users: './users/users_bundle.js', raven: './raven/index.js', vue_merge_request_widget: './vue_merge_request_widget/index.js', + test: './test.js', }, output: { |