diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-06-20 17:43:47 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-06-20 17:43:47 +0300 |
| commit | c6eb18ee0fe1b887438da87f25fc2f2a852dd393 (patch) | |
| tree | 71e4e35697da7355ebd6f9b4ea9bfe8efd396b2a /config | |
| parent | 7fed708c146fd9937e334d4e7639c6c81c7d164c (diff) | |
| parent | 6b4f93c0349e9d54cb48f1d5cf025c5e5ce77aee (diff) | |
Merge branch '57973-errors-in-application-settings-panel-shows-wrong-panel' into 'master'
Errors in application settings panel shows wrong panel
See merge request gitlab-org/gitlab-ce!25434
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/admin.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes/admin.rb b/config/routes/admin.rb index ae79beb1dba..f609739d9fd 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -110,7 +110,7 @@ namespace :admin do put :reset_registration_token put :reset_health_check_token put :clear_repository_check_states - get :integrations, :repository, :templates, :ci_cd, :reporting, :metrics_and_profiling, :network, :geo, :preferences + match :integrations, :repository, :templates, :ci_cd, :reporting, :metrics_and_profiling, :network, :geo, :preferences, via: [:get, :patch] get :lets_encrypt_terms_of_service end |