BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
ae431963
Commit
ae431963
authored
Jan 30, 2017
by
Fatih Acet
Committed by
DJ Mountney
Jan 31, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch '27047-8-16-cannot-login-with-2fa' into 'master'
Resolve "Cannot login with 2fa" Closes #27047 See merge request !8730
parent
e43d661e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
12 deletions
+12
-12
dispatcher.js.es6
app/assets/javascripts/dispatcher.js.es6
+12
-12
No files found.
app/assets/javascripts/dispatcher.js.es6
View file @
ae431963
...
@@ -64,17 +64,6 @@
...
@@ -64,17 +64,6 @@
new UsernameValidator();
new UsernameValidator();
new ActiveTabMemoizer();
new ActiveTabMemoizer();
break;
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:show':
case 'projects:boards:index':
case 'projects:boards:index':
shortcut_handler = new ShortcutsNavigation();
shortcut_handler = new ShortcutsNavigation();
...
@@ -281,6 +270,17 @@
...
@@ -281,6 +270,17 @@
break;
break;
}
}
switch (path.first()) {
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':
case 'admin':
new Admin();
new Admin();
switch (path[1]) {
switch (path[1]) {
...
@@ -358,7 +358,7 @@
...
@@ -358,7 +358,7 @@
}
}
// If we haven't installed a custom shortcut handler, install the default one
// If we haven't installed a custom shortcut handler, install the default one
if (!shortcut_handler) {
if (!shortcut_handler) {
return
new Shortcuts();
new Shortcuts();
}
}
};
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment