Add latest changes from gitlab-org/gitlab@master

3 files changed, 33 insertions, 0 deletions

diff --git a/db/migrate/20200212133945_add_group_hooks_to_plan_limits.rb b/db/migrate/20200212133945_add_group_hooks_to_plan_limits.rb
new file mode 100644
index 00000000000..4e279ff903d
--- /dev/null
+++ b/db/migrate/20200212133945_add_group_hooks_to_plan_limits.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddGroupHooksToPlanLimits < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  def change
+    add_column(:plan_limits, :group_hooks, :integer, default: 0, null: false)
+  end
+end
diff --git a/db/migrate/20200212134201_insert_group_hooks_plan_limits.rb b/db/migrate/20200212134201_insert_group_hooks_plan_limits.rb
new file mode 100644
index 00000000000..a2963cfaf4d
--- /dev/null
+++ b/db/migrate/20200212134201_insert_group_hooks_plan_limits.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class InsertGroupHooksPlanLimits < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    return unless Gitlab.com?
+
+    create_or_update_plan_limit('group_hooks', 'bronze', 50)
+    create_or_update_plan_limit('group_hooks', 'silver', 50)
+    create_or_update_plan_limit('group_hooks', 'gold', 50)
+  end
+
+  def down
+    return unless Gitlab.com?
+
+    create_or_update_plan_limit('group_hooks', 'bronze', 0)
+    create_or_update_plan_limit('group_hooks', 'silver', 0)
+    create_or_update_plan_limit('group_hooks', 'gold', 0)
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 36bf8ad5e01..ac647a9eadf 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -3109,6 +3109,7 @@ ActiveRecord::Schema.define(version: 2020_02_24_163804) do
     t.integer "ci_pipeline_size", default: 0, null: false
     t.integer "ci_active_jobs", default: 0, null: false
     t.integer "project_hooks", default: 0, null: false
+    t.integer "group_hooks", default: 0, null: false
     t.index ["plan_id"], name: "index_plan_limits_on_plan_id", unique: true
   end