diff options
author | Robert Speicher <robert@gitlab.com> | 2016-08-18 18:37:56 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-08-18 18:37:56 +0000 |
commit | 6f3fe923d70b78a7585d2c7c6db4e2ffa3167d75 (patch) | |
tree | c8a1d383ad8761bde66a9c54f0391aff89a0fb5d /config/routes.rb | |
parent | ba0c6e4dd8178d69f3e2878205f24b62120acc55 (diff) | |
parent | dbedf3a61b5fe233b87b217596dea5572fc741b3 (diff) | |
download | gitlab-ce-6f3fe923d70b78a7585d2c7c6db4e2ffa3167d75.tar.gz |
Merge branch '17334-u2f-device-identifiers' into 'master'
Allow naming (and deleting) U2F devices.
## What does this MR do?
- Allow giving each U2F device a name (at the time of registration).
- Allow deleting individual U2F devices.
- Display a list of registered U2F devices.
## What are the relevant issue numbers?
- Closes #17334
- Closes #17335
See merge request !5833
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index 9c74df31de5..5c48bf233d6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -375,6 +375,8 @@ Rails.application.routes.draw do patch :skip end end + + resources :u2f_registrations, only: [:destroy] end end |