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
Jérome Perrin
gitlab-ce
Commits
b898810c
Commit
b898810c
authored
Mar 31, 2016
by
connorshea
Committed by
Connor Shea
May 03, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve the Two-factor Authentication sign-in text [ci skip]
Resolves #14543.
parent
a0ea38c3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
CHANGELOG
CHANGELOG
+1
-0
app/views/devise/sessions/two_factor.html.haml
app/views/devise/sessions/two_factor.html.haml
+2
-2
No files found.
CHANGELOG
View file @
b898810c
...
@@ -17,6 +17,7 @@ v 8.8.0 (unreleased)
...
@@ -17,6 +17,7 @@ v 8.8.0 (unreleased)
- Files over 5MB can only be viewed in their raw form, files over 1MB without highlighting !3718
- Files over 5MB can only be viewed in their raw form, files over 1MB without highlighting !3718
- Add support for supressing text diffs using .gitattributes on the default branch (Matt Oakes)
- Add support for supressing text diffs using .gitattributes on the default branch (Matt Oakes)
- Added multiple colors for labels in dropdowns when dups happen.
- Added multiple colors for labels in dropdowns when dups happen.
- Improve description for the Two-factor Authentication sign-in screen. (Connor Shea)
v 8.7.2
v 8.7.2
- The "New Branch" button is now loaded asynchronously
- The "New Branch" button is now loaded asynchronously
...
...
app/views/devise/sessions/two_factor.html.haml
View file @
b898810c
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
%h3
Two-factor Authentication
%h3
Two-factor 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
|
=
f
.
text_field
:otp_attempt
,
class:
'form-control'
,
placeholder:
'Two-factor
a
uthentication code'
,
required:
true
,
autofocus:
true
=
f
.
text_field
:otp_attempt
,
class:
'form-control'
,
placeholder:
'Two-factor
A
uthentication code'
,
required:
true
,
autofocus:
true
%p
.help-block.hint
If you've lost your phon
e, you may enter one of your recovery codes.
%p
.help-block.hint
Enter the code from the two-factor app on your mobile device. If you've lost your devic
e, you may enter one of your recovery codes.
.prepend-top-20
.prepend-top-20
=
f
.
submit
"Verify code"
,
class:
"btn btn-save"
=
f
.
submit
"Verify code"
,
class:
"btn btn-save"
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