summaryrefslogtreecommitdiff
path: root/config/routes.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-12-10 18:14:42 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-12-10 18:14:42 +0000
commitca5de528358c23e9cfcb0ff0f42c4106310c3811 (patch)
tree92a0375549df74e40c3f3799a5de7a91fcd1a3a7 /config/routes.rb
parentecc11e5d608ff4393fb6c44d02416569e7d2785d (diff)
downloadgitlab-ce-ca5de528358c23e9cfcb0ff0f42c4106310c3811.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/routes.rb')
-rw-r--r--config/routes.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 94d36961b32..6aa5e0a6869 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -145,7 +145,7 @@ Rails.application.routes.draw do
get 'acme-challenge/' => 'acme_challenges#show'
# UserCallouts
- resources :user_callouts, only: [:create]
+ resources :user_callouts, controller: 'users/callouts', only: [:create] # remove after 14.6 2021-12-22 to handle mixed deployments
scope :ide, as: :ide, format: false do
get '/', to: 'ide#index'