summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-06 16:46:36 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-06-06 16:46:36 +0200
commit3137a7fec37b7fb66ea464f4c5fdab964a73d390 (patch)
tree042228550ffc5f729a5358208c97283acf950721 /config
parent842f0a3401de8d358fce850df288d9822e523c6e (diff)
parent13d4231eb9f577456b420ff5044c55584add9b39 (diff)
downloadgitlab-ce-3137a7fec37b7fb66ea464f4c5fdab964a73d390.tar.gz
Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 1fc7985136b..27ab79d68f5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -343,8 +343,9 @@ Rails.application.routes.draw do
resources :keys
resources :emails, only: [:index, :create, :destroy]
resource :avatar, only: [:destroy]
- resource :two_factor_auth, only: [:new, :create, :destroy] do
+ resource :two_factor_auth, only: [:show, :create, :destroy] do
member do
+ post :create_u2f
post :codes
patch :skip
end