diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 03:09:34 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 03:09:34 +0300 |
commit | 3cd08f4bf96cda3e9d3abf233095107832b17c20 (patch) | |
tree | dc09a618783a79d70f2a404374d4b850ccf9cc84 /config/routes.rb | |
parent | dd4bee69b7d55620f7dc9db8c36b478bd4959755 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/routes.rb b/config/routes.rb index cf39ca3384d..466555eeee8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -133,6 +133,9 @@ Rails.application.routes.draw do get :kill end end + + # Notification settings + resources :notification_settings, only: [:create, :update] end concern :clusterable do @@ -181,9 +184,6 @@ Rails.application.routes.draw do # Spam reports resources :abuse_reports, only: [:new, :create] - # Notification settings - resources :notification_settings, only: [:create, :update] - resources :groups, only: [:index, :new, :create] do post :preview_markdown end |