Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

1 files changed, 2 insertions, 1 deletions

diff --git a/config/routes.rb b/config/routes.rb
index 94d36961b32..b02c1380c7e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -72,6 +72,7 @@ Rails.application.routes.draw do
       resources :groups_projects, only: [:new, :create] do
         post :import, on: :collection
       end
+      draw :verification
     end
   end
 
@@ -145,7 +146,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'