diff options
| author | Luke Picciau <git@itscode.red> | 2018-09-17 18:59:21 +0300 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2018-09-17 18:59:21 +0300 |
| commit | 8ee1ccf093fc6effb95dda17a73850b1b95d4d2b (patch) | |
| tree | d9d3ae249e2e9ab3778e42df131527fae28d4477 | |
| parent | 623ba9fd64bd349581d8f60c69d8933f641fa1e4 (diff) | |
Add 2fa button
| -rw-r--r-- | app/assets/stylesheets/pages/profile.scss | 4 | ||||
| -rw-r--r-- | app/views/profiles/two_factor_auths/_codes.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/add-2fa-button.yml | 5 |
3 files changed, 12 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss index 17f34319050..caa839c32a5 100644 --- a/app/assets/stylesheets/pages/profile.scss +++ b/app/assets/stylesheets/pages/profile.scss @@ -279,6 +279,10 @@ table.u2f-registrations { } } +.codes { + padding-top: 14px; +} + .oauth-application-show { .scope-name { font-weight: $gl-font-weight-bold; diff --git a/app/views/profiles/two_factor_auths/_codes.html.haml b/app/views/profiles/two_factor_auths/_codes.html.haml index 93722d7b034..30a22099bbc 100644 --- a/app/views/profiles/two_factor_auths/_codes.html.haml +++ b/app/views/profiles/two_factor_auths/_codes.html.haml @@ -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' diff --git a/changelogs/unreleased/add-2fa-button.yml b/changelogs/unreleased/add-2fa-button.yml new file mode 100644 index 00000000000..6cb71d52781 --- /dev/null +++ b/changelogs/unreleased/add-2fa-button.yml @@ -0,0 +1,5 @@ +--- +title: Add button to download 2FA codes +merge_request: +author: Luke Picciau +type: added |