Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

1 files changed, 17 insertions, 0 deletions

diff --git a/db/migrate/20210806152104_add_pypi_package_requests_forwarding_to_application_settings.rb b/db/migrate/20210806152104_add_pypi_package_requests_forwarding_to_application_settings.rb
new file mode 100644
index 00000000000..34f8ec43a8f
--- /dev/null
+++ b/db/migrate/20210806152104_add_pypi_package_requests_forwarding_to_application_settings.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddPypiPackageRequestsForwardingToApplicationSettings < ActiveRecord::Migration[6.1]
+  include Gitlab::Database::MigrationHelpers
+
+  def up
+    with_lock_retries do
+      add_column(:application_settings, :pypi_package_requests_forwarding, :boolean, default: true, null: false)
+    end
+  end
+
+  def down
+    with_lock_retries do
+      remove_column(:application_settings, :pypi_package_requests_forwarding)
+    end
+  end
+end