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
ea946652
Commit
ea946652
authored
Apr 30, 2021
by
Yogi
Committed by
Kushal Pandya
Apr 30, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move 2fa recovery codes to GlCard component
parent
bda86133
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
5 deletions
+10
-5
app/assets/javascripts/authentication/two_factor_auth/components/recovery_codes.vue
...hentication/two_factor_auth/components/recovery_codes.vue
+5
-5
changelogs/unreleased/yogi-gl-card-recovery-codes.yml
changelogs/unreleased/yogi-gl-card-recovery-codes.yml
+5
-0
No files found.
app/assets/javascripts/authentication/two_factor_auth/components/recovery_codes.vue
View file @
ea946652
<
script
>
import
{
GlSprintf
,
GlButton
,
GlAlert
}
from
'
@gitlab/ui
'
;
import
{
GlSprintf
,
GlButton
,
GlAlert
,
GlCard
}
from
'
@gitlab/ui
'
;
import
Mousetrap
from
'
mousetrap
'
;
import
{
__
}
from
'
~/locale
'
;
import
Tracking
from
'
~/tracking
'
;
...
...
@@ -34,7 +34,7 @@ export default {
recoveryCodeDownloadFilename
:
RECOVERY_CODE_DOWNLOAD_FILENAME
,
i18n
,
mousetrap
:
null
,
components
:
{
GlSprintf
,
GlButton
,
GlAlert
,
ClipboardButton
},
components
:
{
GlSprintf
,
GlButton
,
GlAlert
,
ClipboardButton
,
GlCard
},
mixins
:
[
Tracking
.
mixin
()],
props
:
{
codes
:
{
...
...
@@ -116,8 +116,8 @@ export default {
</gl-sprintf>
</p>
<
div
class=
"codes-to-print gl-my-5
gl-p-5 gl-border-solid gl-border-1 gl-border-gray-100 gl-rounded-base
"
<
gl-card
class=
"codes-to-print gl-my-5"
data-testid=
"recovery-codes"
data-qa-selector=
"codes_content"
>
...
...
@@ -126,7 +126,7 @@ export default {
<span
class=
"gl-font-monospace"
data-qa-selector=
"code_content"
>
{{ code }}
</span>
</li>
</ul>
</
div
>
</
gl-card
>
<div
class=
"gl-my-n2 gl-mx-n2 gl-display-flex gl-flex-wrap"
>
<div
class=
"gl-p-2"
>
<clipboard-button
...
...
changelogs/unreleased/yogi-gl-card-recovery-codes.yml
0 → 100644
View file @
ea946652
---
title
:
Move 2fa recovery codes to GlCard component
merge_request
:
59219
author
:
Yogi (@yo)
type
:
changed
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