summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-03-02 16:28:43 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-03-02 16:28:43 +0000
commit29356cfee159d4ffd539a7f3ad007c3ef5f76b92 (patch)
tree8700bbfe017123578fd0a0bccf181d06220844c0 /config
parente7d0b649ac2a9b2df14f56050da040b983af7e81 (diff)
parent617a8e2a3abd74b90f2bed4a2d20e7239f41d103 (diff)
downloadgitlab-ce-29356cfee159d4ffd539a7f3ad007c3ef5f76b92.tar.gz
Merge branch 'two_factor_auth_webpack_bundle_tag_refactor' into 'master'
Removes webpack bundle tag for two factor auth js See merge request gitlab-org/gitlab-ce!17330
Diffstat (limited to 'config')
-rw-r--r--config/webpack.config.js1
1 files changed, 0 insertions, 1 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 32c972f4dd3..9dd3cd401de 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -46,7 +46,6 @@ function generateEntries() {
monitoring: './monitoring/monitoring_bundle.js',
mr_notes: './mr_notes/index.js',
terminal: './terminal/terminal_bundle.js',
- two_factor_auth: './two_factor_auth.js',
common: './commons/index.js',
common_vue: './vue_shared/vue_resource_interceptor.js',