kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'add-2fa-button' into 'master'

Browse source 
Add 2fa button

Closes #47963

See merge request gitlab-org/gitlab-ce!20117
This commit is contained in:
Annabel Dunstone Gray 2018-09-17 15:59:21 +00:00
commit 47c157af47
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/pages/profile.scss
View file

@ -279,6 +279,10 @@ table.u2f-registrations {
}
}
.codes {
padding-top: 14px;
}
.oauth-application-show {
.scope-name {
font-weight: $gl-font-weight-bold;

4
app/views/profiles/two_factor_auths/_codes.html.haml
View file

@ -10,4 +10,6 @@
%li
%span.monospace= code
= link_to 'Proceed', profile_account_path, class: 'btn btn-success'
.d-flex
= link_to 'Proceed', profile_account_path, class: 'btn btn-success append-right-10'
= link_to 'Download codes', "data:text/plain;charset=utf-8,#{URI.encode(@codes.join("\n"))}", download: "gitlab-recovery-codes.txt", class: 'btn btn-default'

5
changelogs/unreleased/add-2fa-button.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Add button to download 2FA codes
merge_request:
author: Luke Picciau
type: added