Add push_event_activities_limit setting

This setting will be used to determine whether individual or bulk
push event will be created.

app/helpers/application_settings_helper.rb

@@ -290,7 +290,8 @@ module ApplicationSettingsHelper
       :snowplow_cookie_domain,
       :snowplow_enabled,
       :snowplow_site_id,
-      :push_event_hooks_limit
+      :push_event_hooks_limit,
+      :push_event_activities_limit
     ]
   end
 

app/models/application_setting.rb

@@ -217,6 +217,9 @@ class ApplicationSetting < ApplicationRecord
   validates :push_event_hooks_limit,
             numericality: { greater_than_or_equal_to: 0 }
 
+  validates :push_event_activities_limit,
+            numericality: { greater_than_or_equal_to: 0 }
+
   SUPPORTED_KEY_TYPES.each do |type|
     validates :"#{type}_key_restriction", presence: true, key_restriction: { type: type }
   end

app/models/application_setting_implementation.rb

@@ -83,6 +83,7 @@ module ApplicationSettingImplementation
         project_export_enabled: true,
         protected_ci_variables: false,
         push_event_hooks_limit: 3,
+        push_event_activities_limit: 3,
         raw_blob_request_limit: 300,
         recaptcha_enabled: false,
         login_recaptcha_protection_enabled: false,

app/views/admin/application_settings/_performance.html.haml

@@ -25,5 +25,10 @@
       = f.number_field :push_event_hooks_limit, class: 'form-control'
       .form-text.text-muted
         = _("Number of changes (branches or tags) in a single push to determine whether webhooks and services will be fired or not. Webhooks and services won't be submitted if it surpasses that value.")
+    .form-group
+      = f.label :push_event_activities_limit, class: 'label-bold'
+      = f.number_field :push_event_activities_limit, class: 'form-control'
+      .form-text.text-muted
+        = _('Number of changes (branches or tags) in a single push to determine whether individual push events or bulk push event will be created. Bulk push event will be created if it surpasses that value.')
 
   = f.submit 'Save changes', class: "btn btn-success"

db/migrate/20191008013056_add_push_event_activities_limit_to_application_settings.rb

+# frozen_string_literal: true
+
+class AddPushEventActivitiesLimitToApplicationSettings < ActiveRecord::Migration[5.2]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_column_with_default(:application_settings, :push_event_activities_limit, :integer, default: 3)
+  end
+
+  def down
+    remove_column(:application_settings, :push_event_activities_limit)
+  end
+end

db/schema.rb

@@ -339,6 +339,7 @@ ActiveRecord::Schema.define(version: 2019_10_16_072826) do
     t.integer "throttle_incident_management_notification_period_in_seconds", default: 3600
     t.integer "throttle_incident_management_notification_per_period", default: 3600
     t.integer "push_event_hooks_limit", default: 3, null: false
+    t.integer "push_event_activities_limit", default: 3, null: false
     t.index ["custom_project_templates_group_id"], name: "index_application_settings_on_custom_project_templates_group_id"
     t.index ["file_template_project_id"], name: "index_application_settings_on_file_template_project_id"
     t.index ["instance_administration_project_id"], name: "index_applicationsettings_on_instance_administration_project_id"

lib/api/settings.rb

@@ -102,6 +102,7 @@ module API
       optional :project_export_enabled, type: Boolean, desc: 'Enable project export'
       optional :prometheus_metrics_enabled, type: Boolean, desc: 'Enable Prometheus metrics'
       optional :push_event_hooks_limit, type: Integer, desc: "Number of changes (branches or tags) in a single push to determine whether webhooks and services will be fired or not. Webhooks and services won't be submitted if it surpasses that value."
+      optional :push_event_activities_limit, type: Integer, desc: 'Number of changes (branches or tags) in a single push to determine whether individual push events or bulk push event will be created. Bulk push event will be created if it surpasses that value.'
       optional :recaptcha_enabled, type: Boolean, desc: 'Helps prevent bots from creating accounts'
       given recaptcha_enabled: ->(val) { val } do
         requires :recaptcha_site_key, type: String, desc: 'Generate site key at http://www.google.com/recaptcha'

locale/gitlab.pot

@@ -11193,6 +11193,9 @@ msgstr ""
 msgid "Number of LOCs per commit"
 msgstr ""
 
+msgid "Number of changes (branches or tags) in a single push to determine whether individual push events or bulk push event will be created. Bulk push event will be created if it surpasses that value."
+msgstr ""
+
 msgid "Number of changes (branches or tags) in a single push to determine whether webhooks and services will be fired or not. Webhooks and services won't be submitted if it surpasses that value."
 msgstr ""
 

spec/models/application_setting_spec.rb

@@ -60,6 +60,10 @@ describe ApplicationSetting do
     it { is_expected.not_to allow_value('three').for(:push_event_hooks_limit) }
     it { is_expected.not_to allow_value(nil).for(:push_event_hooks_limit) }
 
+    it { is_expected.to allow_value(3).for(:push_event_activities_limit) }
+    it { is_expected.not_to allow_value('three').for(:push_event_activities_limit) }
+    it { is_expected.not_to allow_value(nil).for(:push_event_activities_limit) }
+
     context "when user accepted let's encrypt terms of service" do
       before do
         setting.update(lets_encrypt_terms_of_service_accepted: true)

spec/requests/api/settings_spec.rb

@@ -73,7 +73,8 @@ describe API::Settings, 'Settings' do
             local_markdown_version: 3,
             allow_local_requests_from_web_hooks_and_services: true,
             allow_local_requests_from_system_hooks: false,
-            push_event_hooks_limit: 2
+            push_event_hooks_limit: 2,
+            push_event_activities_limit: 2
           }
 
         expect(response).to have_gitlab_http_status(200)
@@ -104,6 +105,7 @@ describe API::Settings, 'Settings' do
         expect(json_response['allow_local_requests_from_web_hooks_and_services']).to eq(true)
         expect(json_response['allow_local_requests_from_system_hooks']).to eq(false)
         expect(json_response['push_event_hooks_limit']).to eq(2)
+        expect(json_response['push_event_activities_limit']).to eq(2)
       end
     end