Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

4 files changed, 6 insertions, 6 deletions

diff --git a/app/assets/javascripts/authentication/mount_2fa.js b/app/assets/javascripts/authentication/mount_2fa.js
index 6dead2f03db..52ed67b8c7b 100644
--- a/app/assets/javascripts/authentication/mount_2fa.js
+++ b/app/assets/javascripts/authentication/mount_2fa.js
@@ -1,7 +1,7 @@
 import $ from 'jquery';
 import initU2F from './u2f';
-import initWebauthn from './webauthn';
 import U2FRegister from './u2f/register';
+import initWebauthn from './webauthn';
 import WebAuthnRegister from './webauthn/register';
 
 export const mount2faAuthentication = () => {
diff --git a/app/assets/javascripts/authentication/two_factor_auth/components/recovery_codes.vue b/app/assets/javascripts/authentication/two_factor_auth/components/recovery_codes.vue
index 87502db8b82..0e589d98668 100644
--- a/app/assets/javascripts/authentication/two_factor_auth/components/recovery_codes.vue
+++ b/app/assets/javascripts/authentication/two_factor_auth/components/recovery_codes.vue
@@ -1,9 +1,9 @@
 <script>
-import Mousetrap from 'mousetrap';
 import { GlSprintf, GlButton, GlAlert } from '@gitlab/ui';
-import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
-import Tracking from '~/tracking';
+import Mousetrap from 'mousetrap';
 import { __ } from '~/locale';
+import Tracking from '~/tracking';
+import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
 import {
   COPY_BUTTON_ACTION,
   DOWNLOAD_BUTTON_ACTION,
diff --git a/app/assets/javascripts/authentication/u2f/authenticate.js b/app/assets/javascripts/authentication/u2f/authenticate.js
index f5217e9c9be..22eca904f32 100644
--- a/app/assets/javascripts/authentication/u2f/authenticate.js
+++ b/app/assets/javascripts/authentication/u2f/authenticate.js
@@ -1,7 +1,7 @@
 import $ from 'jquery';
 import { template as lodashTemplate, omit } from 'lodash';
-import importU2FLibrary from './util';
 import U2FError from './error';
+import importU2FLibrary from './util';
 
 // Authenticate U2F (universal 2nd factor) devices for users to authenticate with.
 //
diff --git a/app/assets/javascripts/authentication/u2f/register.js b/app/assets/javascripts/authentication/u2f/register.js
index 52940e1c305..6c98f0978bc 100644
--- a/app/assets/javascripts/authentication/u2f/register.js
+++ b/app/assets/javascripts/authentication/u2f/register.js
@@ -1,8 +1,8 @@
 import $ from 'jquery';
 import { template as lodashTemplate } from 'lodash';
 import { __ } from '~/locale';
-import importU2FLibrary from './util';
 import U2FError from './error';
+import importU2FLibrary from './util';
 
 // Register U2F (universal 2nd factor) devices for users to authenticate with.
 //