Merge branch 'ce-docker_image_replication' into 'master'

Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3809

See merge request gitlab-org/gitlab-ce!31375

2 files changed, 14 insertions, 0 deletions

diff --git a/db/migrate/20190612111404_add_geo_container_sync_capacity.rb b/db/migrate/20190612111404_add_geo_container_sync_capacity.rb
new file mode 100644
index 00000000000..d4cd569f460
--- /dev/null
+++ b/db/migrate/20190612111404_add_geo_container_sync_capacity.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class AddGeoContainerSyncCapacity < ActiveRecord::Migration[5.1]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def change
+    change_table :geo_nodes do |t|
+      t.column :container_repositories_max_capacity, :integer, default: 10, null: false
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index df2662b770b..3d229c2353b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1441,6 +1441,7 @@ ActiveRecord::Schema.define(version: 2019_07_31_084415) do
     t.integer "minimum_reverification_interval", default: 7, null: false
     t.string "internal_url"
     t.string "name", null: false
+    t.integer "container_repositories_max_capacity", default: 10, null: false
     t.index ["access_key"], name: "index_geo_nodes_on_access_key"
     t.index ["name"], name: "index_geo_nodes_on_name", unique: true
     t.index ["primary"], name: "index_geo_nodes_on_primary"