Support upgrading from 8.13 to 10.x
This commit is contained in:
parent
4a40e0c5d0
commit
843488ce2e
2 changed files with 23 additions and 0 deletions
22
debian/patches/fix-8-to-10-migration.patch
vendored
Normal file
22
debian/patches/fix-8-to-10-migration.patch
vendored
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
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..e4ff8261120 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 Feature::FlipperFeature.table_exists?
|
||||||
|
+ return (status == MigrationStatus::OPT_OUT) || opt_into_all_features?
|
||||||
|
+ end
|
||||||
|
+
|
||||||
|
feature = Feature.get("gitaly_#{feature_name}")
|
||||||
|
|
||||||
|
# If the feature has been set, always evaluate
|
||||||
|
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
|
@ -20,3 +20,4 @@ add-system-lib-path-for-webpack.patch
|
||||||
remove-bundle-analyzer.patch
|
remove-bundle-analyzer.patch
|
||||||
fix-mail-room-path.patch
|
fix-mail-room-path.patch
|
||||||
relax-ruby-version.pacth
|
relax-ruby-version.pacth
|
||||||
|
fix-8-to-10-migration.patch
|
||||||
|
|
Loading…
Reference in a new issue