diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-09-02 14:21:59 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-09-02 14:21:59 +0000 |
| commit | df6e50448a2e97856805f5e4a70831f2ba8a0ef2 (patch) | |
| tree | 5e5dc709238c54a8e5213cd11f577751fc744ef8 /VERSION | |
| parent | 3043b31c458bf720843a84b35c9fbad5c1488c1d (diff) | |
| parent | dcc20876554ae18c6869b80071728f1b91858c5f (diff) | |
| download | gitlab-shell-df6e50448a2e97856805f5e4a70831f2ba8a0ef2.tar.gz | |
Merge branch '2fa_recovery' into 'master'
Add option to recover 2FA via SSH
Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/3765
Allow users to recover their own account if they lose their 2FA device or recovery codes.
## Questions/Concerns
- Does this look secure? I think it is but we need to make sure no one can spoof a username or something and disable two factor.
## Todo
- [x] Working code
- [x] Tests
- [x] GitLab merge requests (including documentation)
See merge request !74
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions