Add latest changes from gitlab-org/gitlab@master

5 files changed, 6 insertions, 27 deletions

diff --git a/lib/api/group_clusters.rb b/lib/api/group_clusters.rb
index 0108f6feae3..2c12c6387fb 100644
--- a/lib/api/group_clusters.rb
+++ b/lib/api/group_clusters.rb
@@ -53,6 +53,7 @@ module API
         requires :name, type: String, desc: 'Cluster name'
         optional :enabled, type: Boolean, default: true, desc: 'Determines if cluster is active or not, defaults to true'
         optional :domain, type: String, desc: 'Cluster base domain'
+        optional :management_project_id, type: Integer, desc: 'The ID of the management project'
         optional :managed, type: Boolean, default: true, desc: 'Determines if GitLab will manage namespaces and service accounts for this cluster, defaults to true'
         requires :platform_kubernetes_attributes, type: Hash, desc: %q(Platform Kubernetes data) do
           requires :api_url, type: String, allow_blank: false, desc: 'URL to access the Kubernetes API'
diff --git a/lib/api/project_clusters.rb b/lib/api/project_clusters.rb
index b482980b88a..299301aabc4 100644
--- a/lib/api/project_clusters.rb
+++ b/lib/api/project_clusters.rb
@@ -56,6 +56,7 @@ module API
         requires :name, type: String, desc: 'Cluster name'
         optional :enabled, type: Boolean, default: true, desc: 'Determines if cluster is active or not, defaults to true'
         optional :domain, type: String, desc: 'Cluster base domain'
+        optional :management_project_id, type: Integer, desc: 'The ID of the management project'
         optional :managed, type: Boolean, default: true, desc: 'Determines if GitLab will manage namespaces and service accounts for this cluster, defaults to true'
         requires :platform_kubernetes_attributes, type: Hash, desc: %q(Platform Kubernetes data) do
           requires :api_url, type: String, allow_blank: false, desc: 'URL to access the Kubernetes API'
diff --git a/lib/gitlab/application_rate_limiter.rb b/lib/gitlab/application_rate_limiter.rb
index c1066d8fa62..2defbd26b98 100644
--- a/lib/gitlab/application_rate_limiter.rb
+++ b/lib/gitlab/application_rate_limiter.rb
@@ -19,8 +19,9 @@ module Gitlab
       # and only do that when it's needed.
       def rate_limits
         {
-          project_export:              { threshold: 1, interval: 5.minutes },
-          project_download_export:     { threshold: 10, interval: 10.minutes },
+          issues_create:                { threshold: -> { Gitlab::CurrentSettings.current_application_settings.issues_create_limit }, interval: 1.minute },
+          project_export:               { threshold: 1, interval: 5.minutes },
+          project_download_export:      { threshold: 10, interval: 10.minutes },
           project_repositories_archive: { threshold: 5, interval: 1.minute },
           project_generate_new_export: { threshold: 1, interval: 5.minutes },
           project_import:              { threshold: 30, interval: 5.minutes },
diff --git a/lib/gitlab/sidekiq_middleware/duplicate_jobs.rb b/lib/gitlab/sidekiq_middleware/duplicate_jobs.rb
deleted file mode 100644
index 7a77a56d642..00000000000
--- a/lib/gitlab/sidekiq_middleware/duplicate_jobs.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require 'digest'
-
-module Gitlab
-  module SidekiqMiddleware
-    module DuplicateJobs
-      DROPPABLE_QUEUES = Set.new([
-        Namespaces::RootStatisticsWorker.queue,
-        Namespaces::ScheduleAggregationWorker.queue
-      ]).freeze
-
-      def self.drop_duplicates?(queue_name)
-        Feature.enabled?(:drop_duplicate_sidekiq_jobs) ||
-          drop_duplicates_for_queue?(queue_name)
-      end
-
-      private_class_method def self.drop_duplicates_for_queue?(queue_name)
-        DROPPABLE_QUEUES.include?(queue_name) &&
-          Feature.enabled?(:drop_duplicate_sidekiq_jobs_for_queue)
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb b/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb
index a9007039334..79bbb99752e 100644
--- a/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb
+++ b/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb
@@ -67,7 +67,7 @@ module Gitlab
         end
 
         def droppable?
-          idempotent? && duplicate? && DuplicateJobs.drop_duplicates?(queue_name)
+          idempotent? && duplicate?
         end
 
         private