summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-16 21:06:30 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-16 21:06:30 +0000
commit274ea604fcd43ecccfba04756a9475a3efa47de0 (patch)
tree33b203dedc5e5b980f945bdf01b9f16fe698417d /config
parent930ff68c1efc380cb7522aa9b3884842eecb2486 (diff)
downloadgitlab-ce-274ea604fcd43ecccfba04756a9475a3efa47de0.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r--config/routes/admin.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index 6f9a5552564..a003ffca270 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
- match :integrations, :repository, :templates, :ci_cd, :reporting, :metrics_and_profiling, :network, :geo, :preferences, via: [:get, :patch]
+ match :general, :integrations, :repository, :templates, :ci_cd, :reporting, :metrics_and_profiling, :network, :geo, :preferences, via: [:get, :patch]
get :lets_encrypt_terms_of_service
end