Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
75cdabe9
Commit
75cdabe9
authored
Feb 21, 2020
by
sstern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace underscore from lodash in ./uf2
parent
89431973
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
app/assets/javascripts/u2f/authenticate.js
app/assets/javascripts/u2f/authenticate.js
+3
-3
app/assets/javascripts/u2f/register.js
app/assets/javascripts/u2f/register.js
+2
-2
No files found.
app/assets/javascripts/u2f/authenticate.js
View file @
75cdabe9
import
$
from
'
jquery
'
;
import
$
from
'
jquery
'
;
import
_
from
'
underscore
'
;
import
{
template
as
lodashTemplate
,
omit
}
from
'
lodash
'
;
import
importU2FLibrary
from
'
./util
'
;
import
importU2FLibrary
from
'
./util
'
;
import
U2FError
from
'
./error
'
;
import
U2FError
from
'
./error
'
;
...
@@ -37,7 +37,7 @@ export default class U2FAuthenticate {
...
@@ -37,7 +37,7 @@ export default class U2FAuthenticate {
// Note: The server library fixes this behaviour in (unreleased) version 1.0.0.
// Note: The server library fixes this behaviour in (unreleased) version 1.0.0.
// This can be removed once we upgrade.
// This can be removed once we upgrade.
// https://github.com/castle/ruby-u2f/commit/103f428071a81cd3d5f80c2e77d522d5029946a4
// https://github.com/castle/ruby-u2f/commit/103f428071a81cd3d5f80c2e77d522d5029946a4
this
.
signRequests
=
u2fParams
.
sign_requests
.
map
(
request
=>
_
(
request
).
omit
(
'
challenge
'
));
this
.
signRequests
=
u2fParams
.
sign_requests
.
map
(
request
=>
omit
(
request
,
'
challenge
'
));
this
.
templates
=
{
this
.
templates
=
{
setup
:
'
#js-authenticate-u2f-setup
'
,
setup
:
'
#js-authenticate-u2f-setup
'
,
...
@@ -74,7 +74,7 @@ export default class U2FAuthenticate {
...
@@ -74,7 +74,7 @@ export default class U2FAuthenticate {
renderTemplate
(
name
,
params
)
{
renderTemplate
(
name
,
params
)
{
const
templateString
=
$
(
this
.
templates
[
name
]).
html
();
const
templateString
=
$
(
this
.
templates
[
name
]).
html
();
const
template
=
_
.
t
emplate
(
templateString
);
const
template
=
lodashT
emplate
(
templateString
);
return
this
.
container
.
html
(
template
(
params
));
return
this
.
container
.
html
(
template
(
params
));
}
}
...
...
app/assets/javascripts/u2f/register.js
View file @
75cdabe9
import
$
from
'
jquery
'
;
import
$
from
'
jquery
'
;
import
_
from
'
underscore
'
;
import
{
template
as
lodashTemplate
}
from
'
lodash
'
;
import
importU2FLibrary
from
'
./util
'
;
import
importU2FLibrary
from
'
./util
'
;
import
U2FError
from
'
./error
'
;
import
U2FError
from
'
./error
'
;
...
@@ -59,7 +59,7 @@ export default class U2FRegister {
...
@@ -59,7 +59,7 @@ export default class U2FRegister {
renderTemplate
(
name
,
params
)
{
renderTemplate
(
name
,
params
)
{
const
templateString
=
$
(
this
.
templates
[
name
]).
html
();
const
templateString
=
$
(
this
.
templates
[
name
]).
html
();
const
template
=
_
.
t
emplate
(
templateString
);
const
template
=
lodashT
emplate
(
templateString
);
return
this
.
container
.
html
(
template
(
params
));
return
this
.
container
.
html
(
template
(
params
));
}
}
...
...
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