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
95118575
Commit
95118575
authored
May 15, 2019
by
Luke Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve CE/EE diffs in accounts/show
Part of single codebase changes.
parent
7dc29e9c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
app/views/profiles/accounts/show.html.haml
app/views/profiles/accounts/show.html.haml
+3
-3
No files found.
app/views/profiles/accounts/show.html.haml
View file @
95118575
...
@@ -8,17 +8,17 @@
...
@@ -8,17 +8,17 @@
.row.prepend-top-default
.row.prepend-top-default
.col-lg-4.profile-settings-sidebar
.col-lg-4.profile-settings-sidebar
%h4
.prepend-top-0
%h4
.prepend-top-0
=
s_
(
"Profiles|Two-Factor Authentication"
)
=
s_
(
'Profiles|Two-Factor Authentication'
)
%p
%p
=
s_
(
"Profiles|Increase your account's security by enabling Two-Factor Authentication (2FA)"
)
=
s_
(
"Profiles|Increase your account's security by enabling Two-Factor Authentication (2FA)"
)
.col-lg-8
.col-lg-8
%p
%p
#{
_
(
'Status'
)
}
:
#{
current_user
.
two_factor_enabled?
?
_
(
'Enabled'
)
:
_
(
'Disabled'
)
}
#{
_
(
'Status'
)
}
:
#{
current_user
.
two_factor_enabled?
?
_
(
'Enabled'
)
:
_
(
'Disabled'
)
}
-
if
current_user
.
two_factor_enabled?
-
if
current_user
.
two_factor_enabled?
=
link_to
_
(
"Manage two-factor authentication"
),
profile_two_factor_auth_path
,
class:
'btn btn-info'
=
link_to
_
(
'Manage two-factor authentication'
),
profile_two_factor_auth_path
,
class:
'btn btn-info'
-
else
-
else
.append-bottom-10
.append-bottom-10
=
link_to
_
(
"Enable two-factor authentication"
),
profile_two_factor_auth_path
,
class:
'btn btn-success'
=
link_to
_
(
'Enable two-factor authentication'
),
profile_two_factor_auth_path
,
class:
'btn btn-success'
%hr
%hr
-
if
display_providers_on_profile?
-
if
display_providers_on_profile?
...
...
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