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
094b928a
Commit
094b928a
authored
Jan 26, 2021
by
Yogi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply new GitLab UI and moved to btn-confirm for buttons in 2fa
Add Changelog Update btn-confirm-2fa.yml
parent
d566a31e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
4 deletions
+9
-4
app/views/authentication/_register.html.haml
app/views/authentication/_register.html.haml
+2
-2
app/views/profiles/accounts/show.html.haml
app/views/profiles/accounts/show.html.haml
+1
-1
app/views/profiles/two_factor_auths/show.html.haml
app/views/profiles/two_factor_auths/show.html.haml
+1
-1
changelogs/unreleased/btn-confirm-2fa.yml
changelogs/unreleased/btn-confirm-2fa.yml
+5
-0
No files found.
app/views/authentication/_register.html.haml
View file @
094b928a
...
...
@@ -7,13 +7,13 @@
-
if
current_user
.
two_factor_otp_enabled?
.row.gl-mb-3
.col-md-5
%button
#js-setup-token-2fa-device
.gl-button.btn.btn-
info
=
_
(
"Set up new device"
)
%button
#js-setup-token-2fa-device
.gl-button.btn.btn-
confirm
=
_
(
"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
.gl-button.btn.btn-
info
.btn-block
{
disabled:
true
}=
_
(
"Set up new device"
)
%button
#js-setup-token-2fa-device
.gl-button.btn.btn-
confirm
.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."
)
...
...
app/views/profiles/accounts/show.html.haml
View file @
094b928a
...
...
@@ -25,7 +25,7 @@
%p
#{
_
(
'Status'
)
}
:
#{
current_user
.
two_factor_enabled?
?
_
(
'Enabled'
)
:
_
(
'Disabled'
)
}
-
if
current_user
.
two_factor_enabled?
=
link_to
_
(
'Manage two-factor authentication'
),
profile_two_factor_auth_path
,
class:
'gl-button btn btn-
info
'
=
link_to
_
(
'Manage two-factor authentication'
),
profile_two_factor_auth_path
,
class:
'gl-button btn btn-
confirm
'
-
else
.gl-mb-3
=
link_to
_
(
'Enable two-factor authentication'
),
profile_two_factor_auth_path
,
class:
'gl-button btn btn-success'
,
data:
{
qa_selector:
'enable_2fa_button'
}
...
...
app/views/profiles/two_factor_auths/show.html.haml
View file @
094b928a
...
...
@@ -22,7 +22,7 @@
data:
{
confirm:
webauthn_enabled
?
_
(
'Are you sure? This will invalidate your registered applications and U2F / WebAuthn devices.'
)
:
_
(
'Are you sure? This will invalidate your registered applications and U2F devices.'
)
},
class:
'gl-button btn btn-danger gl-mr-3'
=
form_tag
codes_profile_two_factor_auth_path
,
{
style:
'display: inline-block'
,
method: :post
}
do
|
f
|
=
submit_tag
_
(
'Regenerate recovery codes'
),
class:
'
btn
'
=
submit_tag
_
(
'Regenerate recovery codes'
),
class:
'
gl-button btn btn-default
'
-
else
%p
...
...
changelogs/unreleased/btn-confirm-2fa.yml
0 → 100644
View file @
094b928a
---
title
:
Apply new GitLab UI for buttons in 2fa and changed deprecated info to confirm
merge_request
:
52580
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