Merge branch 'master' into stretch-backports

debian/changelog

@@ -10,7 +10,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 <praveen@debian.org>  Wed, 27 Jun 2018 16:14:20 +0530
 

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~),

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
-