Add latest changes from gitlab-org/gitlab@master

3 files changed, 15 insertions, 0 deletions

diff --git a/db/migrate/20220613054349_add_unique_project_download_limit_settings_to_namespace_settings.rb b/db/migrate/20220613054349_add_unique_project_download_limit_settings_to_namespace_settings.rb
new file mode 100644
index 00000000000..7e821cb17a2
--- /dev/null
+++ b/db/migrate/20220613054349_add_unique_project_download_limit_settings_to_namespace_settings.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class AddUniqueProjectDownloadLimitSettingsToNamespaceSettings < Gitlab::Database::Migration[2.0]
+  enable_lock_retries!
+
+  def change
+    add_column :namespace_settings, :unique_project_download_limit, :smallint,
+      default: 0, null: false
+    add_column :namespace_settings, :unique_project_download_limit_interval_in_seconds, :integer,
+      default: 0, null: false
+  end
+end
diff --git a/db/schema_migrations/20220613054349 b/db/schema_migrations/20220613054349
new file mode 100644
index 00000000000..1c3806a80c8
--- /dev/null
+++ b/db/schema_migrations/20220613054349
@@ -0,0 +1 @@
+4c3e4852614dd1a59d63809c40417887794bcbbcf8d3ea3a96f8846e2bd5f795
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index f697bacdfc5..2013a434bab 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -17550,6 +17550,8 @@ CREATE TABLE namespace_settings (
     project_runner_token_expiration_interval integer,
     exclude_from_free_user_cap boolean DEFAULT false NOT NULL,
     enabled_git_access_protocol smallint DEFAULT 0 NOT NULL,
+    unique_project_download_limit smallint DEFAULT 0 NOT NULL,
+    unique_project_download_limit_interval_in_seconds integer DEFAULT 0 NOT NULL,
     CONSTRAINT check_0ba93c78c7 CHECK ((char_length(default_branch_name) <= 255))
 );