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

5 files changed, 22 insertions, 6 deletions

diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index dac1937b76a..7f19f6b8427 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -186,4 +186,6 @@ namespace :admin do
   get '/dashboard/stats', to: 'dashboard#stats'
 
   root to: 'dashboard#index'
+
+  get :version_check, to: 'version_check#version_check'
 end
diff --git a/config/routes/group.rb b/config/routes/group.rb
index 9a50d580747..da205163e6d 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -126,11 +126,9 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
       end
     end
 
-    resources :crm, only: [] do
-      collection do
-        get 'contacts'
-        get 'organizations'
-      end
+    namespace :crm do
+      resources :contacts, only: [:index, :new, :edit]
+      resources :organizations, only: [:index, :new]
     end
   end
 
diff --git a/config/routes/profile.rb b/config/routes/profile.rb
index 3eda53318e3..b8d4a0c49c2 100644
--- a/config/routes/profile.rb
+++ b/config/routes/profile.rb
@@ -22,7 +22,14 @@ resource :profile, only: [:show, :update] do
     end
 
     resource :notifications, only: [:show, :update] do
-      resources :groups, only: :update, constraints: { id: Gitlab::PathRegex.full_namespace_route_regex }
+      scope(path: 'groups/*id',
+        id: Gitlab::PathRegex.full_namespace_route_regex,
+        as: :group,
+        controller: :groups,
+        constraints: { format: /(html|json)/ }) do
+        patch '/', action: :update
+        put '/', action: :update
+      end
     end
 
     resource :password, only: [:new, :create, :edit, :update] do
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 7f9b2cc4fbf..5f1b35d67c0 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -317,6 +317,10 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
 
         resources :google_cloud, only: [:index]
 
+        namespace :google_cloud do
+          resources :service_accounts, only: [:index, :create]
+        end
+
         resources :environments, except: [:destroy] do
           member do
             post :stop
@@ -453,6 +457,10 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
             end
           end
         end
+
+        namespace :integrations do
+          resource :shimo, only: [:show]
+        end
       end
       # End of the /-/ scope.
 
diff --git a/config/routes/user.rb b/config/routes/user.rb
index 01de59c3357..64dc56e18ec 100644
--- a/config/routes/user.rb
+++ b/config/routes/user.rb
@@ -61,6 +61,7 @@ scope '-/users', module: :users do
     post :decline, on: :member
   end
 
+  resources :callouts, only: [:create]
   resources :group_callouts, only: [:create]
 end