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
85e0bbc4
Commit
85e0bbc4
authored
Mar 07, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move u2f library to webpack
parent
24f1ee5e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
4 deletions
+3
-4
two_factor.html.haml
app/views/devise/sessions/two_factor.html.haml
+1
-1
show.html.haml
app/views/profiles/two_factor_auths/show.html.haml
+1
-2
application.rb
config/application.rb
+0
-1
webpack.config.js
config/webpack.config.js
+1
-0
No files found.
app/views/devise/sessions/two_factor.html.haml
View file @
85e0bbc4
-
if
inject_u2f_api?
-
if
inject_u2f_api?
-
content_for
:page_specific_javascripts
do
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_
tag
(
'u2f.js
'
)
=
page_specific_javascript_
bundle_tag
(
'u2f
'
)
%div
%div
=
render
'devise/shared/tab_single'
,
tab_title:
'Two-Factor Authentication'
=
render
'devise/shared/tab_single'
,
tab_title:
'Two-Factor Authentication'
...
...
app/views/profiles/two_factor_auths/show.html.haml
View file @
85e0bbc4
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
-
if
inject_u2f_api?
-
if
inject_u2f_api?
-
content_for
:page_specific_javascripts
do
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_
tag
(
'u2f.js
'
)
=
page_specific_javascript_
bundle_tag
(
'u2f
'
)
.row.prepend-top-default
.row.prepend-top-default
.col-lg-3
.col-lg-3
...
@@ -96,4 +96,3 @@
...
@@ -96,4 +96,3 @@
:javascript
:javascript
var
button
=
"<a class='btn btn-xs btn-warning pull-right' data-method='patch' href='
#{
skip_profile_two_factor_auth_path
}
'>Configure it later</a>"
;
var
button
=
"<a class='btn btn-xs btn-warning pull-right' data-method='patch' href='
#{
skip_profile_two_factor_auth_path
}
'>Configure it later</a>"
;
$
(
".flash-alert"
).
append
(
button
);
$
(
".flash-alert"
).
append
(
button
);
config/application.rb
View file @
85e0bbc4
...
@@ -100,7 +100,6 @@ module Gitlab
...
@@ -100,7 +100,6 @@ module Gitlab
config
.
assets
.
precompile
<<
"katex.js"
config
.
assets
.
precompile
<<
"katex.js"
config
.
assets
.
precompile
<<
"xterm/xterm.css"
config
.
assets
.
precompile
<<
"xterm/xterm.css"
config
.
assets
.
precompile
<<
"lib/ace.js"
config
.
assets
.
precompile
<<
"lib/ace.js"
config
.
assets
.
precompile
<<
"u2f.js"
config
.
assets
.
precompile
<<
"vendor/assets/fonts/*"
config
.
assets
.
precompile
<<
"vendor/assets/fonts/*"
# Version of your assets, change this if you want to expire all your assets
# Version of your assets, change this if you want to expire all your assets
...
...
config/webpack.config.js
View file @
85e0bbc4
...
@@ -40,6 +40,7 @@ var config = {
...
@@ -40,6 +40,7 @@ var config = {
protected_branches
:
'./protected_branches/protected_branches_bundle.js'
,
protected_branches
:
'./protected_branches/protected_branches_bundle.js'
,
snippet
:
'./snippet/snippet_bundle.js'
,
snippet
:
'./snippet/snippet_bundle.js'
,
terminal
:
'./terminal/terminal_bundle.js'
,
terminal
:
'./terminal/terminal_bundle.js'
,
u2f
:
[
'vendor/u2f'
],
users
:
'./users/users_bundle.js'
,
users
:
'./users/users_bundle.js'
,
vue_pipelines
:
'./vue_pipelines_index/index.js'
,
vue_pipelines
:
'./vue_pipelines_index/index.js'
,
},
},
...
...
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