From ecf2ac105ca1755d56f6c5ff80ddb1f9b7f7b35e Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 11 Mar 2020 12:49:40 +0200 Subject: [PATCH 1/2] Move notification_settings route under - scope Signed-off-by: Dmitriy Zaporozhets --- config/routes.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index cf39ca3384d255..466555eeee81c2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -133,6 +133,9 @@ get :kill end end + + # Notification settings + resources :notification_settings, only: [:create, :update] end concern :clusterable do @@ -181,9 +184,6 @@ # 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 -- GitLab From be4776823230c8ce83f7f205cb609e68cc239245 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 11 Mar 2020 12:52:42 +0200 Subject: [PATCH 2/2] Remove notification_settings from reserved names Signed-off-by: Dmitriy Zaporozhets --- doc/user/reserved_names.md | 1 - lib/gitlab/path_regex.rb | 1 - 2 files changed, 2 deletions(-) diff --git a/doc/user/reserved_names.md b/doc/user/reserved_names.md index b160cb03f94eb5..3e53bc0fd81266 100644 --- a/doc/user/reserved_names.md +++ b/doc/user/reserved_names.md @@ -69,7 +69,6 @@ Currently the following names are reserved as top level groups: - `invites` - `jwt` - `login` -- `notification_settings` - `oauth` - `profile` - `projects` diff --git a/lib/gitlab/path_regex.rb b/lib/gitlab/path_regex.rb index db094bfe973d0f..5fa0fbf874c231 100644 --- a/lib/gitlab/path_regex.rb +++ b/lib/gitlab/path_regex.rb @@ -42,7 +42,6 @@ module PathRegex invites jwt login - notification_settings oauth profile projects -- GitLab