summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-03-01 15:05:49 -0600
committerMike Greiling <mike@pixelcog.com>2018-03-01 23:27:47 -0600
commit617a8e2a3abd74b90f2bed4a2d20e7239f41d103 (patch)
treee00c600c260a273b6f510e6dc79434fbf0021c8b
parentbb41a889487463f626796a390148ae7870c16824 (diff)
downloadgitlab-ce-617a8e2a3abd74b90f2bed4a2d20e7239f41d103.tar.gz
remove two_factor_auth bundletwo_factor_auth_webpack_bundle_tag_refactor
-rw-r--r--app/assets/javascripts/pages/profiles/two_factor_auths/index.js (renamed from app/assets/javascripts/two_factor_auth.js)2
-rw-r--r--app/views/profiles/two_factor_auths/show.html.haml4
-rw-r--r--config/webpack.config.js1
3 files changed, 1 insertions, 6 deletions
diff --git a/app/assets/javascripts/two_factor_auth.js b/app/assets/javascripts/pages/profiles/two_factor_auths/index.js
index e3414d9afff..5b2473e0989 100644
--- a/app/assets/javascripts/two_factor_auth.js
+++ b/app/assets/javascripts/pages/profiles/two_factor_auths/index.js
@@ -1,4 +1,4 @@
-import U2FRegister from './u2f/register';
+import U2FRegister from '~/u2f/register';
document.addEventListener('DOMContentLoaded', () => {
const twoFactorNode = document.querySelector('.js-two-factor-auth');
diff --git a/app/views/profiles/two_factor_auths/show.html.haml b/app/views/profiles/two_factor_auths/show.html.haml
index 329bf16895f..1bd10018b40 100644
--- a/app/views/profiles/two_factor_auths/show.html.haml
+++ b/app/views/profiles/two_factor_auths/show.html.haml
@@ -2,10 +2,6 @@
- add_to_breadcrumbs("Two-Factor Authentication", profile_account_path)
- @content_class = "limit-container-width" unless fluid_layout
-
-- content_for :page_specific_javascripts do
- = webpack_bundle_tag('two_factor_auth')
-
.js-two-factor-auth{ 'data-two-factor-skippable' => "#{two_factor_skippable?}", 'data-two_factor_skip_url' => skip_profile_two_factor_auth_path }
.row.prepend-top-default
.col-lg-4
diff --git a/config/webpack.config.js b/config/webpack.config.js
index fd0bfb59e65..b883f5fd927 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -48,7 +48,6 @@ function generateEntries() {
protected_branches: './protected_branches',
registry_list: './registry/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',