diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-08-18 16:43:26 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-08-18 16:43:26 -0500 |
| commit | 8b05e8c2d10f78467db8bec140950104eba49e92 (patch) | |
| tree | 3933fdeb2089a448c82aa6c75b3087bcbca665f9 /config | |
| parent | b5d0346a99401ec138ee411660b5c7ee28421f84 (diff) | |
| parent | d97c83096a70ed102f993d4c484aff9c786ca831 (diff) | |
| download | gitlab-ce-8b05e8c2d10f78467db8bec140950104eba49e92.tar.gz | |
Merge branch 'master' into diff-line-comment-vuejs
# Conflicts:
# db/schema.rb
Diffstat (limited to 'config')
| -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 624e07b0947..66f77aee06a 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 |