diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-06-15 10:12:55 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-06-15 10:12:55 +0000 |
| commit | 3a857e0e6c9460692f4b5d61e634205da9dee63a (patch) | |
| tree | d452f5872abba0c27fa416f4d73dd0977bd964db /lib/container_registry | |
| parent | 8249fdcd47b33c71e5f9908c0ac877487070e39d (diff) | |
| parent | d8a531687c8aaef67d6b7586916273cf59d4b5a3 (diff) | |
| download | gitlab-ce-3a857e0e6c9460692f4b5d61e634205da9dee63a.tar.gz | |
Merge branch '17333-u2f-only-after-authenticator' into 'master'
Don't allow U2F set up unless an authenticator app is set up
Closes #17333
# TODO
- [ ] #17333 Authenticator should be set up before enabling U2F
- [x] Implementation
- [x] Fix/add tests
- [x] Refactor
- [x] Wait for [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/964c98a3c427cac6e3de88ddc74a9f172ee9742d/builds) to pass
- [x] Assign to endboss for review
- [x] Address @DouweM's comments
- [x] No need for `javascript:void(0)`
- [x] Add screenshots
- [ ] Wait for merge
# Screenshots
See merge request !4585
Diffstat (limited to 'lib/container_registry')
0 files changed, 0 insertions, 0 deletions