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
66a86653
Commit
66a86653
authored
Jan 19, 2021
by
Yogi
Committed by
David O'Regan
Jan 19, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add gl-button to Set up new device button in 2fa settings
parent
bb3b021d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
app/views/authentication/_register.html.haml
app/views/authentication/_register.html.haml
+2
-2
changelogs/unreleased/2fa-gl-button.yml
changelogs/unreleased/2fa-gl-button.yml
+5
-0
No files found.
app/views/authentication/_register.html.haml
View file @
66a86653
...
...
@@ -7,13 +7,13 @@
-
if
current_user
.
two_factor_otp_enabled?
.row.gl-mb-3
.col-md-5
%button
#js-setup-token-2fa-device
.btn.btn-info
=
_
(
"Set up new device"
)
%button
#js-setup-token-2fa-device
.
gl-button.
btn.btn-info
=
_
(
"Set up new device"
)
.col-md-7
%p
=
_
(
"Your device needs to be set up. Plug it in (if needed) and click the button on the left."
)
-
else
.row.gl-mb-3
.col-md-4
%button
#js-setup-token-2fa-device
.btn.btn-info.btn-block
{
disabled:
true
}=
_
(
"Set up new device"
)
%button
#js-setup-token-2fa-device
.
gl-button.
btn.btn-info.btn-block
{
disabled:
true
}=
_
(
"Set up new device"
)
.col-md-8
%p
=
_
(
"You need to register a two-factor authentication app before you can set up a device."
)
...
...
changelogs/unreleased/2fa-gl-button.yml
0 → 100644
View file @
66a86653
---
title
:
Add gl-button to Set up new device button in 2fa settings
merge_request
:
51283
author
:
Yogi (@yo)
type
:
other
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