Merge branch 'master' into 'docs/fix-example-dot-net'

# Conflicts:
#   doc/user/project/clusters/serverless/index.md

1 files changed, 24 insertions, 0 deletions

diff --git a/db/migrate/20190516155724_change_packages_size_defaults_in_project_statistics.rb b/db/migrate/20190516155724_change_packages_size_defaults_in_project_statistics.rb
new file mode 100644
index 00000000000..eba154df496
--- /dev/null
+++ b/db/migrate/20190516155724_change_packages_size_defaults_in_project_statistics.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class ChangePackagesSizeDefaultsInProjectStatistics < ActiveRecord::Migration[5.1]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    change_column_default :project_statistics, :packages_size, 0
+
+    update_column_in_batches(:project_statistics, :packages_size, 0) do |table, query|
+      query.where(table[:packages_size].eq(nil))
+    end
+
+    change_column_null :project_statistics, :packages_size, false
+  end
+
+  def down
+    change_column_null :project_statistics, :packages_size, true
+    change_column_default :project_statistics, :packages_size, nil
+  end
+end