Tighten dependency on ruby-method-source and ruby-grape

Relax dependency on ruby-method-source
Fix protobuf compatibility issue with patch
2020-03-22 21:39:26 +05:30 · 2020-03-22 21:39:07 +05:30 · 2020-03-22 21:33:45 +05:30 · 2020-03-22 14:51:58 +05:30 · 2020-03-17 17:31:56 +05:30 · 2020-03-17 16:05:40 +05:30
8 changed files with 60 additions and 5 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,16 @@
+gitlab (12.6.8-3) unstable; urgency=medium
+
+  * Reupload to unstable (grpc and protobuf updated in unstable)
+
+ -- Pirate Praveen <praveen@debian.org>  Sun, 22 Mar 2020 14:51:44 +0530
+
+gitlab (12.6.8-2) experimental; urgency=medium
+
+  * Relax dependency on rails in Gemfile
+  * Relax deckar01-task_list dependency in Gemfile
+
+ -- Pirate Praveen <praveen@debian.org>  Tue, 17 Mar 2020 17:31:39 +0530
+
 gitlab (12.6.8-1) experimental; urgency=medium

  * Refresh stable gems in test group
--- a/debian/control
+++ b/debian/control
@ -95,7 +95,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
   ruby-ntlm (>= 0.6.1~),
 ruby-net-ldap (>= 0.16.1~),
 # API
- ruby-grape (>= 1.1~),
+ ruby-grape (>= 1.3~),
 ruby-grape-entity (>= 0.7.1~),
 ruby-rack-cors (>= 1.0.6~),
 # GraphQL API
@ -279,7 +279,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
    ruby-statistics,
    ruby-heapy,
 # Metrics
- ruby-method-source (>= 0.8.2-2~),
+ ruby-method-source (>= 1.0~),
 ruby-influxdb (>= 0.2~),
 # Prometheus
 ruby-prometheus-client-mmap (>= 0.10~),
--- a/debian/patches/0050-relax-stable-libs.patch
+++ b/debian/patches/0050-relax-stable-libs.patch
@ -3,6 +3,14 @@ gitlab Gemfile

 --- a/Gemfile
 +++ b/Gemfile
+@@ -1,6 +1,6 @@
+ source 'https://rubygems.org'
+ 
+-gem 'rails', '5.2.3'
+gem 'rails', '~> 5.2.3'
+ 
+ gem 'bootsnap', '~> 1.4'
+ 
@@ -10,10 +10,10 @@
 # Responders respond_to and respond_with
 gem 'responders', '~> 3.0'
@ -149,9 +157,10 @@ gitlab Gemfile
 
 # Markdown and HTML processing
 gem 'html-pipeline', '~> 2.12'
- gem 'deckar01-task_list', '2.2.1'
+-gem 'deckar01-task_list', '2.2.1'
 -gem 'gitlab-markup', '~> 1.7.0'
 -gem 'github-markup', '~> 1.7.0', require: 'github/markup'
+gem 'deckar01-task_list', '~> 2.3', '>= 2.2.1'
 +gem 'gitlab-markup', '~> 1.7'
 +gem 'github-markup', '~> 1.7', require: 'github/markup'
 gem 'commonmarker', '~> 0.20'
--- a/debian/patches/0350-relax-method-source.patch
+++ b/debian/patches/0350-relax-method-source.patch
@ -0,0 +1,11 @@
+--- a/Gemfile
+++ b/Gemfile
+@@ -321,7 +321,7 @@
+ 
+ # Metrics
+ group :metrics do
+-  gem 'method_source', '~> 0.8', require: false
+  gem 'method_source', '~> 1.0', require: false
+   gem 'influxdb', '~> 0.2', require: false
+ 
+   # Prometheus
--- a/debian/patches/0430-remove-gitlab-markup.patch
+++ b/debian/patches/0430-remove-gitlab-markup.patch
@ -3,7 +3,7 @@
@@ -137,7 +137,6 @@
 # Markdown and HTML processing
 gem 'html-pipeline', '~> 2.12'
- gem 'deckar01-task_list', '2.2.1'
+ gem 'deckar01-task_list', '~> 2.3', '>= 2.2.1'
 -gem 'gitlab-markup', '~> 1.7'
 gem 'github-markup', '~> 1.7', require: 'github/markup'
 gem 'commonmarker', '~> 0.20'
--- a/debian/patches/0470-relax-bootsnap.patch
+++ b/debian/patches/0470-relax-bootsnap.patch
@ -2,7 +2,7 @@
 +++ b/Gemfile
@@ -2,7 +2,7 @@
 
- gem 'rails', '5.2.3'
+ gem 'rails', '~> 5.2.3'
 
 -gem 'bootsnap', '~> 1.4'
 +gem 'bootsnap', '~> 1.3'
--- a/debian/patches/0790-protobuf-compat.patch
+++ b/debian/patches/0790-protobuf-compat.patch
@ -0,0 +1,20 @@
+From 3c23634c00ce6c03ea67d74bbfde593a694cee07 Mon Sep 17 00:00:00 2001
+From: Pirate Praveen <praveen@debian.org>
+Date: Sun, 22 Mar 2020 13:10:23 +0000
+Subject: [PATCH 2/2] Fix protobuf compatibility (Thanks to Stan Hu)
+
+---
+ lib/api/helpers/internal_helpers.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/lib/api/helpers/internal_helpers.rb
+++ b/lib/api/helpers/internal_helpers.rb
+@@ -142,7 +142,7 @@
+         return unless %w[git-receive-pack git-upload-pack git-upload-archive].include?(action)
+ 
+         {
+-          repository: repository.gitaly_repository,
+          repository: repository.gitaly_repository.to_h,
+           address: Gitlab::GitalyClient.address(project.repository_storage),
+           token: Gitlab::GitalyClient.token(project.repository_storage),
+           features: Feature::Gitaly.server_feature_flags
--- a/debian/patches/series
+++ b/debian/patches/series
@ -3,6 +3,7 @@
 0110-make-test-dependencies-conditional.patch
 0340-relax-httparty.patch
 #0400-Relax-recaptcha-version.patch
+0350-relax-method-source.patch
 0430-remove-gitlab-markup.patch
 0440-remove-puma.patch
 0460-embed-derailed-benchmarks.patch
@ -32,3 +33,4 @@
 0750-fix-relative-paths.patch
 0770-bump-node-d3.patch
 0780-embed-doorkeeper.patch
+0790-protobuf-compat.patch
Author	SHA1	Message	Date
Pirate Praveen	4d1586a4b8	Tighten dependency on ruby-method-source and ruby-grape	2020-03-22 21:39:26 +05:30
Pirate Praveen	7d8a785e34	Relax dependency on ruby-method-source	2020-03-22 21:39:07 +05:30
Pirate Praveen	bc282abd11	Fix protobuf compatibility issue with patch	2020-03-22 21:33:45 +05:30
Pirate Praveen	b62360f104	Reupload to unstable	2020-03-22 14:51:58 +05:30
Pirate Praveen	96bf52b66d	Upload to experimental	2020-03-17 17:31:56 +05:30
Pirate Praveen	8bd400669e	Relax deckar01-task_list dependency in Gemfile	2020-03-17 16:05:40 +05:30
Pirate Praveen	6bff19ce1f	Relax dependency on rails in Gemfile	2020-03-17 15:55:16 +05:30