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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
bd680999
Commit
bd680999
authored
May 04, 2015
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Be consistent with what we call the 2FA feature
"Two-factor" vs. "2-Factor"
parent
35b62fac
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
11 deletions
+13
-11
app/views/devise/sessions/two_factor.html.haml
app/views/devise/sessions/two_factor.html.haml
+1
-1
app/views/profiles/accounts/show.html.haml
app/views/profiles/accounts/show.html.haml
+10
-8
app/views/profiles/two_factor_auths/codes.html.haml
app/views/profiles/two_factor_auths/codes.html.haml
+1
-1
app/views/profiles/two_factor_auths/create.html.haml
app/views/profiles/two_factor_auths/create.html.haml
+1
-1
No files found.
app/views/devise/sessions/two_factor.html.haml
View file @
bd680999
%div
%div
.login-box
.login-box
.login-heading
.login-heading
%h3
Two-
F
actor Authentication
%h3
Two-
f
actor Authentication
.login-body
.login-body
=
form_for
(
resource
,
as:
resource_name
,
url:
session_path
(
resource_name
),
method: :post
)
do
|
f
|
=
form_for
(
resource
,
as:
resource_name
,
url:
session_path
(
resource_name
),
method: :post
)
do
|
f
|
-
if
@error
-
if
@error
...
...
app/views/profiles/accounts/show.html.haml
View file @
bd680999
...
@@ -30,26 +30,28 @@
...
@@ -30,26 +30,28 @@
%fieldset
%fieldset
-
if
current_user
.
otp_required_for_login
-
if
current_user
.
otp_required_for_login
%legend
.text-success
%legend
.text-success
%i
.fa.fa-check
=
icon
(
'check'
)
Two-
F
actor Authentication enabled
Two-
f
actor Authentication enabled
%div
%div
.pull-right
.pull-right
=
link_to
"Disable 2-Factor Authentication"
,
profile_two_factor_auth_path
,
method: :delete
,
class:
'btn btn-close btn-sm'
=
link_to
"Disable Two-factor Authentication"
,
profile_two_factor_auth_path
,
method: :delete
,
class:
'btn btn-close btn-sm'
,
data:
{
confirm:
'Are you sure?'
}
%p
%p
If you los
t your recovery codes -
you can
If you los
e your recovery codes,
you can
%strong
%strong
=
link_to
"generate new one"
,
codes_profile_two_factor_auth_path
,
method: :post
,
=
succeed
'.'
do
data:
{
confirm:
'After we generate new recovery codes - old codes will not be valid any more. Are you sure?'
}
=
link_to
"generate new ones"
,
codes_profile_two_factor_auth_path
,
method: :post
,
data:
{
confirm:
'This will invalidate the old codes. Are you sure?'
}
-
else
-
else
%legend
Two-
F
actor Authentication
%legend
Two-
f
actor Authentication
%div
%div
%p
%p
Keep your account secure by enabling two-factor authentication.
Keep your account secure by enabling two-factor authentication.
%br
%br
Each time you log in, you’ll be required to provide your password plus a randomly generated access code.
Each time you log in, you’ll be required to provide your password plus a randomly generated access code.
%div
%div
=
link_to
"Enable
2-F
actor Authentication"
,
new_profile_two_factor_auth_path
,
class:
'btn btn-success'
=
link_to
"Enable
Two-f
actor Authentication"
,
new_profile_two_factor_auth_path
,
class:
'btn btn-success'
-
if
show_profile_social_tab?
-
if
show_profile_social_tab?
%fieldset
%fieldset
...
...
app/views/profiles/two_factor_auths/codes.html.haml
View file @
bd680999
%h3
.page-title
Two-
F
actor Authentication Recovery codes
%h3
.page-title
Two-
f
actor Authentication Recovery codes
%hr
%hr
=
render
'codes'
=
render
'codes'
app/views/profiles/two_factor_auths/create.html.haml
View file @
bd680999
.alert.alert-success
.alert.alert-success
Congratulations! You have enabled Two-
F
actor Authentication!
Congratulations! You have enabled Two-
f
actor Authentication!
=
render
'codes'
=
render
'codes'
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