summaryrefslogtreecommitdiff
path: root/config/routes.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-05-02 19:58:54 -0400
committerRobert Speicher <rspeicher@gmail.com>2016-05-02 19:58:54 -0400
commitc9bc3d20efba26f9259eac36c2ee8eed1a12ec59 (patch)
tree1562966b23e5c438d565fefae67dda931006f9dd /config/routes.rb
parent2c468ebd2cb9dd6e490fab0ac14dea062e11cacf (diff)
parent2d5608ac954128026b87b964dd970de645a766f1 (diff)
downloadgitlab-ce-c9bc3d20efba26f9259eac36c2ee8eed1a12ec59.tar.gz
Merge remote-tracking branch 'dev/master' into 'master'
Diffstat (limited to 'config/routes.rb')
-rw-r--r--config/routes.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 5ce1f49ec6a..dafecc94648 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -214,8 +214,6 @@ Rails.application.routes.draw do
resources :keys, only: [:show, :destroy]
resources :identities, except: [:show]
- delete 'stop_impersonation' => 'impersonation#destroy', on: :collection
-
member do
get :projects
get :keys
@@ -225,12 +223,14 @@ Rails.application.routes.draw do
put :unblock
put :unlock
put :confirm
- post 'impersonate' => 'impersonation#create'
+ post :impersonate
patch :disable_two_factor
delete 'remove/:email_id', action: 'remove_email', as: 'remove_email'
end
end
+ resource :impersonation, only: :destroy
+
resources :abuse_reports, only: [:index, :destroy]
resources :spam_logs, only: [:index, :destroy]