diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-09 23:53:02 +0300 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-09 23:53:02 +0300 |
commit | 7c1acb022a215743caa57fde3bb3459b35aaf01d (patch) | |
tree | b85e3113397e980894f08042bb3e387b6f4b0b39 /config/routes.rb | |
parent | 1ad0c968d579fe6ac0b2fc00a1dae32449ceb2c3 (diff) | |
parent | 44501820152083d231459223fe09b9d9641b7c1e (diff) |
Merge remote-tracking branch 'origin/master' into with-pipeline-view
# Conflicts:
# app/views/projects/ci/builds/_build.html.haml
# app/views/projects/commit/_ci_commit.html.haml
# app/views/projects/commit/_commit_box.html.haml
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 2d064fe6899..37ec169efa3 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 @@ -212,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 @@ -223,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] @@ -715,6 +717,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 |