diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-03-02 16:28:43 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-03-02 16:28:43 +0000 |
| commit | 29356cfee159d4ffd539a7f3ad007c3ef5f76b92 (patch) | |
| tree | 8700bbfe017123578fd0a0bccf181d06220844c0 | |
| parent | e7d0b649ac2a9b2df14f56050da040b983af7e81 (diff) | |
| parent | 617a8e2a3abd74b90f2bed4a2d20e7239f41d103 (diff) | |
| download | gitlab-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
| -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.haml | 4 | ||||
| -rw-r--r-- | config/webpack.config.js | 1 |
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 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', |