diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-03-07 02:59:12 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-03-07 02:59:12 -0600 |
| commit | 85e0bbc4f87e5ae3176a70f82625bf4cb9408ca5 (patch) | |
| tree | 0c47056cb3aedf30805c5ba4c9660a5249c803f9 /config | |
| parent | 24f1ee5e9b1f4d9bc8cff581419b091756da8deb (diff) | |
| download | gitlab-ce-85e0bbc4f87e5ae3176a70f82625bf4cb9408ca5.tar.gz | |
move u2f library to webpackmove-u2f-bundle
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 1 | ||||
| -rw-r--r-- | config/webpack.config.js | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index cdb93e50e66..1cc092c4da1 100644 --- a/config/application.rb +++ b/config/application.rb @@ -100,7 +100,6 @@ module Gitlab config.assets.precompile << "katex.js" config.assets.precompile << "xterm/xterm.css" config.assets.precompile << "lib/ace.js" - config.assets.precompile << "u2f.js" config.assets.precompile << "vendor/assets/fonts/*" # Version of your assets, change this if you want to expire all your assets diff --git a/config/webpack.config.js b/config/webpack.config.js index 7298e7109c6..ff5f1412261 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -40,6 +40,7 @@ var config = { protected_branches: './protected_branches/protected_branches_bundle.js', snippet: './snippet/snippet_bundle.js', terminal: './terminal/terminal_bundle.js', + u2f: ['vendor/u2f'], users: './users/users_bundle.js', vue_pipelines: './vue_pipelines_index/index.js', }, |