Add latest changes from gitlab-org/gitlab@13-1-stable-ee

1 files changed, 2 insertions, 3 deletions

diff --git a/config/initializers/fill_shards.rb b/config/initializers/fill_shards.rb
index 40a9a271953..90c0d63e4fe 100644
--- a/config/initializers/fill_shards.rb
+++ b/config/initializers/fill_shards.rb
@@ -1,8 +1,7 @@
-# The `table_exists?` check is needed because during our migration rollback testing,
+# The explicit schema version check is needed because during our migration rollback testing,
 # `Shard.connected?` could be cached and return true even though the table doesn't exist
 return unless Shard.connected?
-return unless Shard.table_exists?
-return unless Shard.connection.index_exists?(:shards, :name, unique: true)
+return unless ActiveRecord::Migrator.current_version >= 20190402150158
 return if Gitlab::Database.read_only?
 
 Shard.populate!