diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-10 15:08:59 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-10 15:08:59 +0300 |
commit | 7351a484d79236b7e9d47c86f2fcc970b7ae10b0 (patch) | |
tree | 651b5fca7ea0460e3ce7c687cfa9e3a3b37eefc8 /config/routes/admin.rb | |
parent | b4ded0ba7b4d2cdbed5b1f331cf2083a25ee4d7c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/routes/admin.rb')
-rw-r--r-- | config/routes/admin.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config/routes/admin.rb b/config/routes/admin.rb index f363823f80c..5493e229f7e 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -107,7 +107,11 @@ namespace :admin do end end - resource :application_settings, only: [:show, :update] do + resource :application_settings, only: :update do + # This redirect should be removed with 13.0 release. + # https://gitlab.com/gitlab-org/gitlab/issues/199427 + get '/', to: redirect('admin/application_settings/general'), as: nil + resources :services, only: [:index, :edit, :update] get :usage_data |