diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-03-09 02:12:25 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-03-09 02:12:25 +0000 |
| commit | 69c1a9ae868593192d45642d3ad1550e057f877f (patch) | |
| tree | 25d83f80b385cb38cc005480c2f2017a3b4c0ed7 /config | |
| parent | 19fd59204f154bffa3025a7ea509b8e7e7b058cc (diff) | |
| parent | 85e0bbc4f87e5ae3176a70f82625bf4cb9408ca5 (diff) | |
| download | gitlab-ce-69c1a9ae868593192d45642d3ad1550e057f877f.tar.gz | |
Merge branch 'move-u2f-bundle' into 'master'
Move u2f javascript library to webpack config
See merge request !9755
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', }, |