Add latest changes from gitlab-org/gitlab@13-0-stable-ee

1 files changed, 29 insertions, 13 deletions

diff --git a/config/routes.rb b/config/routes.rb
index 097814d90a7..86f42822299 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -44,19 +44,6 @@ Rails.application.routes.draw do
 
   use_doorkeeper_openid_connect
 
-  # Autocomplete
-  get '/autocomplete/users' => 'autocomplete#users'
-  get '/autocomplete/users/:id' => 'autocomplete#user'
-  get '/autocomplete/projects' => 'autocomplete#projects'
-  get '/autocomplete/award_emojis' => 'autocomplete#award_emojis'
-  get '/autocomplete/merge_request_target_branches' => 'autocomplete#merge_request_target_branches'
-
-  Gitlab.ee do
-    get '/autocomplete/project_groups' => 'autocomplete#project_groups'
-    get '/autocomplete/project_routes' => 'autocomplete#project_routes'
-    get '/autocomplete/namespace_routes' => 'autocomplete#namespace_routes'
-  end
-
   # Sign up
   get 'users/sign_up/welcome' => 'registrations#welcome'
   patch 'users/sign_up/update_registration' => 'registrations#update_registration'
@@ -75,6 +62,19 @@ Rails.application.routes.draw do
   # Begin of the /-/ scope.
   # Use this scope for all new global routes.
   scope path: '-' do
+    # Autocomplete
+    get '/autocomplete/users' => 'autocomplete#users'
+    get '/autocomplete/users/:id' => 'autocomplete#user'
+    get '/autocomplete/projects' => 'autocomplete#projects'
+    get '/autocomplete/award_emojis' => 'autocomplete#award_emojis'
+    get '/autocomplete/merge_request_target_branches' => 'autocomplete#merge_request_target_branches'
+
+    Gitlab.ee do
+      get '/autocomplete/project_groups' => 'autocomplete#project_groups'
+      get '/autocomplete/project_routes' => 'autocomplete#project_routes'
+      get '/autocomplete/namespace_routes' => 'autocomplete#namespace_routes'
+    end
+
     # '/-/health' implemented by BasicHealthCheck middleware
     get 'liveness' => 'health#liveness'
     get 'readiness' => 'health#readiness'
@@ -129,6 +129,9 @@ Rails.application.routes.draw do
       scope '/push_from_secondary/:geo_node_id' do
         draw :git_http
       end
+
+      # Used for survey responses
+      resources :survey_responses, only: :index
     end
 
     if ENV['GITLAB_CHAOS_SECRET'] || Rails.env.development? || Rails.env.test?
@@ -199,6 +202,19 @@ Rails.application.routes.draw do
   # Deprecated routes.
   # Will be removed as part of https://gitlab.com/gitlab-org/gitlab/-/issues/210024
   scope as: :deprecated do
+    # Autocomplete
+    get '/autocomplete/users' => 'autocomplete#users'
+    get '/autocomplete/users/:id' => 'autocomplete#user'
+    get '/autocomplete/projects' => 'autocomplete#projects'
+    get '/autocomplete/award_emojis' => 'autocomplete#award_emojis'
+    get '/autocomplete/merge_request_target_branches' => 'autocomplete#merge_request_target_branches'
+
+    Gitlab.ee do
+      get '/autocomplete/project_groups' => 'autocomplete#project_groups'
+      get '/autocomplete/project_routes' => 'autocomplete#project_routes'
+      get '/autocomplete/namespace_routes' => 'autocomplete#namespace_routes'
+    end
+
     resources :invites, only: [:show], constraints: { id: /[A-Za-z0-9_-]+/ } do
       member do
         post :accept