debian-mirror-gitlab/debian/patches/0650-fix-8-to-10-migration.patch
2018-10-15 15:54:03 +05:30

21 lines
765 B
Diff

Required to support updation from 8 to 10
Bug, upstream: https://gitlab.com/gitlab-org/gitlab-ce/issues/48040
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb
index 0abae70c443..b16efe37fd2 100644
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
@@ -216,6 +216,12 @@ module Gitlab
# Disabled features are always off!
return false if status == MigrationStatus::DISABLED
+ # If the features table does not exist, don't check the feature, just return
+ # the default
+ unless Gitlab::Database.cached_table_exists?(Feature::FlipperFeature.table_name)
+ return false
+ end
+
feature = Feature.get("gitaly_#{feature_name}")
# If the feature has been set, always evaluate