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
This commit is contained in:
		
						commit
						29356cfee1
					
				| 
						 | 
				
			
			@ -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');
 | 
			
		||||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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',
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue