Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42

1 files changed, 5 insertions, 3 deletions

diff --git a/config/routes.rb b/config/routes.rb
index 9fdd2a70417..8f4c3886e88 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -63,11 +63,12 @@ Rails.application.routes.draw do
       end
     end
 
-    resource :experience_level, only: [:show, :update]
-
     Gitlab.ee do
       resources :groups, only: [:new, :create]
       resources :projects, only: [:new, :create]
+      resources :groups_projects, only: [:new, :create] do
+        post :import, on: :collection
+      end
     end
   end
 
@@ -184,7 +185,7 @@ Rails.application.routes.draw do
     end
 
     Gitlab.jh do
-      draw :province
+      draw :global_jh
     end
 
     if ENV['GITLAB_CHAOS_SECRET'] || Rails.env.development? || Rails.env.test?
@@ -221,6 +222,7 @@ Rails.application.routes.draw do
 
     draw :snippets
     draw :profile
+    draw :members
 
     # Product analytics collector
     match '/collector/i', to: ProductAnalytics::CollectorApp.new, via: :all