diff options
author | Long Nguyen <long.polyglot@gmail.com> | 2016-05-05 15:07:50 +0700 |
---|---|---|
committer | Long Nguyen <long.polyglot@gmail.com> | 2016-05-05 15:07:50 +0700 |
commit | 5f60841d7e4aea2b6298df7ea0423e3baa769df1 (patch) | |
tree | 435917c9667c64432f7f4f08c1d50b5c8e0bf2fb /config/routes.rb | |
parent | ae29ec31e4f71d722e975bfce945aaed7e0d0bd1 (diff) | |
parent | f5ae92d81c022e94500eb9a6949b2322a943a5af (diff) | |
download | gitlab-ce-5f60841d7e4aea2b6298df7ea0423e3baa769df1.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_15572_snippets_tab_under_user_profile
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/config/routes.rb b/config/routes.rb index f6a41331ecf..2bfaa2c2af6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -16,16 +16,18 @@ Rails.application.routes.draw do end end - # Make the built-in Rails routes available in development, otherwise they'd - # get swallowed by the `namespace/project` route matcher below. - # - # See https://git.io/va79N if Rails.env.development? + # Make the built-in Rails routes available in development, otherwise they'd + # get swallowed by the `namespace/project` route matcher below. + # + # See https://git.io/va79N get '/rails/mailers' => 'rails/mailers#index' get '/rails/mailers/:path' => 'rails/mailers#preview' get '/rails/info/properties' => 'rails/info#properties' get '/rails/info/routes' => 'rails/info#routes' get '/rails/info' => 'rails/info#index' + + mount LetterOpenerWeb::Engine, at: '/rails/letter_opener' end namespace :ci do @@ -210,8 +212,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 @@ -221,12 +221,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] @@ -709,6 +711,7 @@ Rails.application.routes.draw do post :toggle_subscription get :referenced_merge_requests get :related_branches + get :can_create_branch end collection do post :bulk_update |