Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

3 files changed, 13 insertions, 7 deletions

diff --git a/config/routes/group.rb b/config/routes/group.rb
index c313f7209fb..fecd3135cba 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -94,7 +94,7 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
 
     concerns :clusterable
 
-    resources :group_members, only: [:index, :create, :update, :destroy], concerns: :access_requestable do
+    resources :group_members, only: [:index, :update, :destroy], concerns: :access_requestable do
       post :resend_invite, on: :member
       delete :leave, on: :collection
     end
@@ -118,6 +118,7 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
     end
 
     resources :container_registries, only: [:index, :show], controller: 'registry/repositories'
+    resources :harbor_registries, only: [:index, :show], controller: 'harbor/repositories'
     resource :dependency_proxy, only: [:show, :update]
     resources :email_campaigns, only: :index
 
diff --git a/config/routes/jira_connect.rb b/config/routes/jira_connect.rb
index 1e871d52c80..344f0114364 100644
--- a/config/routes/jira_connect.rb
+++ b/config/routes/jira_connect.rb
@@ -20,4 +20,6 @@ namespace :jira_connect do
       put :update
     end
   end
+
+  resources :oauth_callbacks, only: [:index]
 end
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 8536ec9fc05..1783f3acc68 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -96,6 +96,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         namespace :ci do
           resource :lint, only: [:show, :create]
           resource :pipeline_editor, only: [:show], controller: :pipeline_editor, path: 'editor'
+          resource :secure_files, only: [:show], controller: :secure_files, path: 'secure_files'
           resources :daily_build_group_report_results, only: [:index], constraints: { format: /(csv|json)/ }
           namespace :prometheus_metrics do
             resources :histograms, only: [:create], constraints: { format: 'json' }
@@ -162,14 +163,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           end
         end
 
-        resources :project_members, except: [:show, :new, :edit], constraints: { id: %r{[a-zA-Z./0-9_\-#%+:]+} }, concerns: :access_requestable do
+        resources :project_members, except: [:show, :new, :create, :edit], constraints: { id: %r{[a-zA-Z./0-9_\-#%+:]+} }, concerns: :access_requestable do
           collection do
             delete :leave
-
-            # Used for import team
-            # from another project
-            get :import
-            post :apply_import
           end
 
           member do
@@ -240,6 +236,8 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           end
         end
 
+        get 'releases/permalink/latest(/)(*suffix_path)', to: 'releases#latest_permalink', as: :latest_release_permalink, format: false
+
         resources :logs, only: [:index] do
           collection do
             get :k8s
@@ -319,7 +317,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         resources :google_cloud, only: [:index]
 
         namespace :google_cloud do
+          resources :revoke_oauth, only: [:create]
           resources :service_accounts, only: [:index, :create]
+          resources :gcp_regions, only: [:index, :create]
 
           get '/deployments/cloud_run', to: 'deployments#cloud_run'
           get '/deployments/cloud_storage', to: 'deployments#cloud_storage'
@@ -541,6 +541,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
       resources :container_registry, only: [:index, :destroy, :show], # rubocop: disable Cop/PutProjectRoutesUnderScope
                                      controller: 'registry/repositories'
 
+      resources :harbor_registry, only: [:index, :show], # rubocop: disable Cop/PutProjectRoutesUnderScope
+                                  controller: 'harbor/repositories'
+
       namespace :registry do
         resources :repository, only: [] do # rubocop: disable Cop/PutProjectRoutesUnderScope
           # We default to JSON format in the controller to avoid ambiguity.