Add latest changes from gitlab-org/gitlab@13-4-stable-ee

5 files changed, 105 insertions, 1 deletions

diff --git a/app/services/concerns/admin/propagate_service.rb b/app/services/concerns/admin/propagate_service.rb
new file mode 100644
index 00000000000..974408f678c
--- /dev/null
+++ b/app/services/concerns/admin/propagate_service.rb
@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+module Admin
+  module PropagateService
+    extend ActiveSupport::Concern
+
+    BATCH_SIZE = 100
+
+    delegate :data_fields_present?, to: :integration
+
+    class_methods do
+      def propagate(integration)
+        new(integration).propagate
+      end
+    end
+
+    def initialize(integration)
+      @integration = integration
+    end
+
+    private
+
+    attr_reader :integration
+
+    def create_integration_for_projects_without_integration
+      loop do
+        batch_ids = Project.uncached { Project.ids_without_integration(integration, BATCH_SIZE) }
+
+        bulk_create_from_integration(batch_ids, 'project') unless batch_ids.empty?
+
+        break if batch_ids.size < BATCH_SIZE
+      end
+    end
+
+    def bulk_create_from_integration(batch_ids, association)
+      service_list = ServiceList.new(batch_ids, service_hash, association).to_array
+
+      Service.transaction do
+        results = bulk_insert(*service_list)
+
+        if data_fields_present?
+          data_list = DataList.new(results, data_fields_hash, integration.data_fields.class).to_array
+
+          bulk_insert(*data_list)
+        end
+
+        run_callbacks(batch_ids) if association == 'project'
+      end
+    end
+
+    def bulk_insert(klass, columns, values_array)
+      items_to_insert = values_array.map { |array| Hash[columns.zip(array)] }
+
+      klass.insert_all(items_to_insert, returning: [:id])
+    end
+
+    # rubocop: disable CodeReuse/ActiveRecord
+    def run_callbacks(batch_ids)
+      if integration.issue_tracker?
+        Project.where(id: batch_ids).update_all(has_external_issue_tracker: true)
+      end
+
+      if integration.type == 'ExternalWikiService'
+        Project.where(id: batch_ids).update_all(has_external_wiki: true)
+      end
+    end
+    # rubocop: enable CodeReuse/ActiveRecord
+
+    def data_fields_hash
+      @data_fields_hash ||= integration.to_data_fields_hash
+    end
+  end
+end
diff --git a/app/services/concerns/incident_management/settings.rb b/app/services/concerns/incident_management/settings.rb
index 13a047ec106..93dfd6a306d 100644
--- a/app/services/concerns/incident_management/settings.rb
+++ b/app/services/concerns/incident_management/settings.rb
@@ -16,5 +16,9 @@ module IncidentManagement
     def process_issues?
       incident_management_setting.create_issue?
     end
+
+    def auto_close_incident?
+      incident_management_setting.auto_close_incident?
+    end
   end
 end
diff --git a/app/services/concerns/incident_management/usage_data.rb b/app/services/concerns/incident_management/usage_data.rb
new file mode 100644
index 00000000000..b91aa59099d
--- /dev/null
+++ b/app/services/concerns/incident_management/usage_data.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module IncidentManagement
+  module UsageData
+    include Gitlab::Utils::UsageData
+
+    def track_incident_action(current_user, target, action)
+      return unless target.incident?
+
+      track_usage_event(:"incident_management_#{action}", current_user.id)
+    end
+
+    # No-op as optionally overridden in implementing classes.
+    # For use to provide checks before calling #track_incident_action.
+    def track_event
+    end
+  end
+end
diff --git a/app/services/concerns/measurable.rb b/app/services/concerns/measurable.rb
index b099a58a9ae..fcb3022a1dc 100644
--- a/app/services/concerns/measurable.rb
+++ b/app/services/concerns/measurable.rb
@@ -45,7 +45,7 @@ module Measurable
   private
 
   def measuring?
-    Feature.enabled?("gitlab_service_measuring_#{service_class}")
+    Feature.enabled?("gitlab_service_measuring_#{service_class}", type: :ops)
   end
 
   # These attributes are always present in log.
diff --git a/app/services/concerns/merge_requests/removes_refs.rb b/app/services/concerns/merge_requests/removes_refs.rb
new file mode 100644
index 00000000000..87c15746548
--- /dev/null
+++ b/app/services/concerns/merge_requests/removes_refs.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module MergeRequests
+  module RemovesRefs
+    def cleanup_refs(merge_request)
+      CleanupRefsService.schedule(merge_request)
+    end
+  end
+end