diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-01-30 10:45:56 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2017-01-30 10:45:56 +0000 |
| commit | b604c93cd6cdfa64b12792503391be71e60a5383 (patch) | |
| tree | cb13f8a70612aea541bede3890c7b61241d46bec | |
| parent | 7bd3ee3bfb9deb1d13af4f8e68e41c19b15c9dfa (diff) | |
| parent | 57cf85df1d6edebf1e92c0612f633748ad3049ab (diff) | |
| download | gitlab-ce-b604c93cd6cdfa64b12792503391be71e60a5383.tar.gz | |
Merge branch '27047-8-16-cannot-login-with-2fa' into 'master'
Resolve "Cannot login with 2fa"
Closes #27047
See merge request !8730
| -rw-r--r-- | app/assets/javascripts/dispatcher.js.es6 | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/app/assets/javascripts/dispatcher.js.es6 b/app/assets/javascripts/dispatcher.js.es6 index 529d476ca4e..502b41c4a25 100644 --- a/app/assets/javascripts/dispatcher.js.es6 +++ b/app/assets/javascripts/dispatcher.js.es6 @@ -64,17 +64,6 @@ new UsernameValidator(); new ActiveTabMemoizer(); break; - case 'sessions:create': - if (!gon.u2f) break; - window.gl.u2fAuthenticate = new gl.U2FAuthenticate( - $("#js-authenticate-u2f"), - '#js-login-u2f-form', - gon.u2f, - document.querySelector('#js-login-2fa-device'), - document.querySelector('.js-2fa-form'), - ); - window.gl.u2fAuthenticate.start(); - break; case 'projects:boards:show': case 'projects:boards:index': shortcut_handler = new ShortcutsNavigation(); @@ -280,6 +269,17 @@ break; } switch (path.first()) { + case 'sessions': + case 'omniauth_callbacks': + if (!gon.u2f) break; + gl.u2fAuthenticate = new gl.U2FAuthenticate( + $('#js-authenticate-u2f'), + '#js-login-u2f-form', + gon.u2f, + document.querySelector('#js-login-2fa-device'), + document.querySelector('.js-2fa-form'), + ); + gl.u2fAuthenticate.start(); case 'admin': new Admin(); switch (path[1]) { @@ -357,7 +357,7 @@ } // If we haven't installed a custom shortcut handler, install the default one if (!shortcut_handler) { - return new Shortcuts(); + new Shortcuts(); } }; |