realaravinth/debian-mirror-gitlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into stretch-backports

Browse source
This commit is contained in:
Pirate Praveen 2018-06-27 18:30:47 +05:30
commit cd5d539339
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debian/changelog vendored
View file

@ -10,7 +10,7 @@ gitlab (10.7.6+dfsg-1) experimental; urgency=medium
* Refresh patches * Refresh patches
* Move common dependencies to gitlab-common * Move common dependencies to gitlab-common
* Don't remove gitlab_data_dir in purge * 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 -- Pirate Praveen <praveen@debian.org> Wed, 27 Jun 2018 16:14:20 +0530

4
debian/control vendored
View file

@ -86,8 +86,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
ruby-ntlm (>= 0.6.1~), ruby-ntlm (>= 0.6.1~),
ruby-net-ldap (>= 0.16.1~), ruby-net-ldap (>= 0.16.1~),
# Git Wiki # Git Wiki
ruby-gollum-lib (>= 4.2.7~), ruby-gollum-lib (>= 4.2.7.5~),
ruby-gollum-rugged-adapter (>= 0.4.4~), ruby-gollum-rugged-adapter (>= 0.4.4.1~),
# Language detection # Language detection
ruby-github-linguist (>= 5.3.3~), ruby-github-linguist (>= 5.3.3~),
ruby-escape-utils (>= 1.2.1~), ruby-escape-utils (>= 1.2.1~),

5
debian/patches/fix-8-to-10-migration.patch vendored
View file

@ -3,7 +3,7 @@ Required to support updation from 8 to 10
Bug, upstream: https://gitlab.com/gitlab-org/gitlab-ce/issues/48040 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 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 --- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb
@@ -216,6 +216,12 @@ module Gitlab @@ -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 + # If the features table does not exist, don't check the feature, just return
+ # the default + # the default
+ unless Feature::FlipperFeature.table_exists? + unless Gitlab::Database.cached_table_exists?(Feature::FlipperFeature.table_name)
+ return false + return false
+ end + end
+ +
feature = Feature.get("gitaly_#{feature_name}") feature = Feature.get("gitaly_#{feature_name}")
# If the feature has been set, always evaluate # If the feature has been set, always evaluate