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

8 files changed, 33 insertions, 18 deletions

diff --git a/config/feature_flags/development/block_external_fork_network_mirrors.yml b/config/feature_flags/development/block_external_fork_network_mirrors.yml
new file mode 100644
index 00000000000..81ff34a3d6e
--- /dev/null
+++ b/config/feature_flags/development/block_external_fork_network_mirrors.yml
@@ -0,0 +1,8 @@
+---
+name: block_external_fork_network_mirrors
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60735
+rollout_issue_url: 
+milestone: '14.0'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/load_balancing_for_web_hook_worker.yml b/config/feature_flags/development/disable_composer_callback.yml
index f9c191e3ab4..93861e50409 100644
--- a/config/feature_flags/development/load_balancing_for_web_hook_worker.yml
+++ b/config/feature_flags/development/disable_composer_callback.yml
@@ -1,8 +1,8 @@
 ---
-name: load_balancing_for_web_hook_worker
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62075
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331365
+name: disable_composer_callback
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64016
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/333587
 milestone: '14.0'
 type: development
-group: group::memory
+group: group::package
 default_enabled: false
diff --git a/config/feature_flags/development/canary_ingress_weight_control.yml b/config/feature_flags/development/update_remote_mirror_inmemory.yml
index 66d3f2de0ea..e1d347ffa7e 100644
--- a/config/feature_flags/development/canary_ingress_weight_control.yml
+++ b/config/feature_flags/development/update_remote_mirror_inmemory.yml
@@ -1,8 +1,8 @@
 ---
-name: canary_ingress_weight_control
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/43816
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/260295
-milestone: '13.5'
+name: update_remote_mirror_inmemory
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63962
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/333517
+milestone: '14.0'
 type: development
-group: group::release
-default_enabled: true
+group: group::gitaly
+default_enabled: false
diff --git a/config/initializers/active_record_keyset_pagination.rb b/config/initializers/active_record_keyset_pagination.rb
index f8c2ada5255..f5692c95276 100644
--- a/config/initializers/active_record_keyset_pagination.rb
+++ b/config/initializers/active_record_keyset_pagination.rb
@@ -2,8 +2,8 @@
 
 module PaginatorExtension
   # This method loads the records for the requested page and returns a keyset paginator object.
-  def keyset_paginate(cursor: nil, per_page: 20)
-    Gitlab::Pagination::Keyset::Paginator.new(scope: self.dup, cursor: cursor, per_page: per_page)
+  def keyset_paginate(cursor: nil, per_page: 20, keyset_order_options: {})
+    Gitlab::Pagination::Keyset::Paginator.new(scope: self.dup, cursor: cursor, per_page: per_page, keyset_order_options: keyset_order_options)
   end
 end
 
diff --git a/config/initializers/declarative_policy.rb b/config/initializers/declarative_policy.rb
index 49267584809..406f88bac23 100644
--- a/config/initializers/declarative_policy.rb
+++ b/config/initializers/declarative_policy.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'declarative_policy'
+
 DeclarativePolicy.configure do
   named_policy :global, ::GlobalPolicy
 end
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index 7bd24ac5f5b..4d25f24a104 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -10,12 +10,6 @@ namespace :admin do
       end
     end
 
-    collection do
-      scope '/-/' do
-        get :cohorts
-      end
-    end
-
     member do
       get :projects
       get :keys
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index f315a8cb28e..283683d22a1 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -196,6 +196,8 @@
   - 2
 - - issue_rebalancing
   - 1
+- - iterations
+  - 1
 - - jira_connect
   - 1
 - - jira_importer
diff --git a/config/webpack.config.js b/config/webpack.config.js
index db5371a7258..c2af7197f94 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -103,6 +103,15 @@ function generateEntries() {
     autoEntries[entry] = defaultEntries.concat(entryPaths);
   });
 
+  /*
+  If you create manual entries, ensure that these import `app/assets/javascripts/webpack.js` right at
+  the top of the entry in order to ensure that the public path is correctly determined for loading
+  assets async. See: https://webpack.js.org/configuration/output/#outputpublicpath
+
+  Note: WebPack 5 has an 'auto' option for the public path which could allow us to remove this option
+  Note 2: If you are using web-workers, you might need to reset the public path, see:
+  https://gitlab.com/gitlab-org/gitlab/-/issues/321656
+   */
   const manualEntries = {
     default: defaultEntries,
     sentry: './sentry/index.js',