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-25 19:43:25 +05:30
commit 794e6f8547
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
debian/changelog vendored
View file

@ -1,9 +1,17 @@
gitlab (10.7.5+dfsg-3~bpo9+1) stretch-backports; urgency=medium
gitlab (10.7.5+dfsg-4~bpo9+1) stretch-backports; urgency=medium
* Rebuild for stretch-backports.
-- Pirate Praveen <praveen@debian.org> Sun, 03 Jun 2018 21:03:45 +0530
gitlab (10.7.5+dfsg-4) experimental; urgency=medium
* Move common dependencies to gitlab-common
* Don't remove gitlab_data_dir in purge
* Support upgrading from 8.13 to 10.x
-- Pirate Praveen <praveen@debian.org> Thu, 21 Jun 2018 21:42:45 +0530
gitlab (10.7.5+dfsg-3) experimental; urgency=medium
* Relax ruby version check (2.3.3 includes security fixes)

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

@ -13,7 +13,11 @@ 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?
<<<<<<< HEAD
+ return (status == MigrationStatus::OPT_OUT) || opt_into_all_features?
=======
+ return false
>>>>>>> master
+ end
+
feature = Feature.get("gitaly_#{feature_name}")