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
208eb7d6
Unverified
Commit
208eb7d6
authored
Jan 22, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added dispatcher imports for sessions route
parent
68cc9ea2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
16 deletions
+34
-16
dispatcher.js
app/assets/javascripts/dispatcher.js
+8
-16
index.js
app/assets/javascripts/pages/omniauth_callbacks/index.js
+5
-0
index.js
app/assets/javascripts/pages/sessions/index.js
+5
-0
u2f.js
app/assets/javascripts/shared/sessions/u2f.js
+16
-0
No files found.
app/assets/javascripts/dispatcher.js
View file @
208eb7d6
...
...
@@ -23,7 +23,6 @@ import GLForm from './gl_form';
import
Shortcuts
from
'./shortcuts'
;
import
ShortcutsNavigation
from
'./shortcuts_navigation'
;
import
ShortcutsIssuable
from
'./shortcuts_issuable'
;
import
U2FAuthenticate
from
'./u2f/authenticate'
;
import
Diff
from
'./diff'
;
import
SearchAutocomplete
from
'./search_autocomplete'
;
import
Activities
from
'./activities'
;
...
...
@@ -537,18 +536,15 @@ import Activities from './activities';
}
switch
(
path
[
0
])
{
case
'sessions'
:
import
(
'./pages/sessions'
)
.
then
(
callDefault
)
.
catch
(
fail
);
break
;
case
'omniauth_callbacks'
:
if
(
!
gon
.
u2f
)
break
;
const
u2fAuthenticate
=
new
U2FAuthenticate
(
$
(
'#js-authenticate-u2f'
),
'#js-login-u2f-form'
,
gon
.
u2f
,
document
.
querySelector
(
'#js-login-2fa-device'
),
document
.
querySelector
(
'.js-2fa-form'
),
);
u2fAuthenticate
.
start
();
// needed in rspec
gl
.
u2fAuthenticate
=
u2fAuthenticate
;
import
(
'./pages/omniauth_callbacks'
)
.
then
(
callDefault
)
.
catch
(
fail
);
break
;
case
'admin'
:
import
(
'./pages/admin'
)
.
then
(
callDefault
)
...
...
@@ -598,10 +594,6 @@ import Activities from './activities';
break
;
}
break
;
case
'dashboard'
:
case
'root'
:
new
UserCallout
();
break
;
case
'profiles'
:
import
(
'./pages/profiles/index/'
)
.
then
(
callDefault
)
...
...
app/assets/javascripts/pages/omniauth_callbacks/index.js
0 → 100644
View file @
208eb7d6
import
initU2F
from
'../../shared/sessions/u2f'
;
export
default
()
=>
{
initU2F
();
};
app/assets/javascripts/pages/sessions/index.js
0 → 100644
View file @
208eb7d6
import
initU2F
from
'../../shared/sessions/u2f'
;
export
default
()
=>
{
initU2F
();
};
app/assets/javascripts/shared/sessions/u2f.js
0 → 100644
View file @
208eb7d6
import
U2FAuthenticate
from
'../../u2f/authenticate'
;
export
default
()
=>
{
if
(
!
gon
.
u2f
)
return
;
const
u2fAuthenticate
=
new
U2FAuthenticate
(
$
(
'#js-authenticate-u2f'
),
'#js-login-u2f-form'
,
gon
.
u2f
,
document
.
querySelector
(
'#js-login-2fa-device'
),
document
.
querySelector
(
'.js-2fa-form'
),
);
u2fAuthenticate
.
start
();
// needed in rspec
gl
.
u2fAuthenticate
=
u2fAuthenticate
;
};
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