From 20c400e4e49055c1680fa20b14699562e3f934d8 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Wed, 27 Jun 2018 17:38:58 +0530 Subject: [PATCH 1/3] Tighten dependencies --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 0d35520420..a7a0f6f10c 100644 --- a/debian/control +++ b/debian/control @@ -86,8 +86,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-ntlm (>= 0.6.1~), ruby-net-ldap (>= 0.16.1~), # Git Wiki - ruby-gollum-lib (>= 4.2.7~), - ruby-gollum-rugged-adapter (>= 0.4.4~), + ruby-gollum-lib (>= 4.2.7.5~), + ruby-gollum-rugged-adapter (>= 0.4.4.1~), # Language detection ruby-github-linguist (>= 5.3.3~), ruby-escape-utils (>= 1.2.1~), From 09ebef6214788bf5334dc77423cbf2e418bb654c Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Wed, 27 Jun 2018 17:54:40 +0530 Subject: [PATCH 2/3] document upstream issue for 8 to 10 upgrade --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index dd42256003..5a46fc2b0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ gitlab (10.7.6+dfsg-1) experimental; urgency=medium * Refresh patches * Move common dependencies to gitlab-common * Don't remove gitlab_data_dir in purge - * Support upgrading from 8.13 to 10.x + * Support upgrading from 8.13 to 10.x (Upstream issue 48040) -- Pirate Praveen Wed, 27 Jun 2018 16:14:20 +0530 From c794d645dd6448726b73db2bce277822720c1448 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Wed, 27 Jun 2018 18:29:42 +0530 Subject: [PATCH 3/3] Performance improvement to the patch --- debian/patches/fix-8-to-10-migration.patch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/patches/fix-8-to-10-migration.patch b/debian/patches/fix-8-to-10-migration.patch index 837780061c..30b35e939d 100644 --- a/debian/patches/fix-8-to-10-migration.patch +++ b/debian/patches/fix-8-to-10-migration.patch @@ -3,7 +3,7 @@ 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 +index 0abae70c443..b16efe37fd2 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -216,6 +216,12 @@ module Gitlab @@ -12,11 +12,10 @@ index 0abae70c443..e4ff8261120 100644 + # If the features table does not exist, don't check the feature, just return + # the default -+ unless Feature::FlipperFeature.table_exists? ++ 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 -