Add latest changes from gitlab-org/gitlab@master

1 files changed, 20 insertions, 0 deletions

diff --git a/db/migrate/20191213120427_fix_max_pages_size.rb b/db/migrate/20191213120427_fix_max_pages_size.rb
new file mode 100644
index 00000000000..498ea91b773
--- /dev/null
+++ b/db/migrate/20191213120427_fix_max_pages_size.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class FixMaxPagesSize < ActiveRecord::Migration[5.2]
+  DOWNTIME = false
+  MAX_SIZE = 1.terabyte / 1.megabyte
+
+  class ApplicationSetting < ActiveRecord::Base
+    self.table_name = 'application_settings'
+    self.inheritance_column = :_type_disabled
+  end
+
+  def up
+    table = ApplicationSetting.arel_table
+    ApplicationSetting.where(table[:max_pages_size].gt(MAX_SIZE)).update_all(max_pages_size: MAX_SIZE)
+  end
+
+  def down
+    # no-op
+  end
+end