From 1528c4dcc8c3c38fc177ee83e6dc08860a3541ba Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Fri, 30 Apr 2021 17:25:10 +0530
Subject: [PATCH] Relax dependency of gon in Gemfile and update minimum version
 in d/control

---
 debian/control                              | 2 +-
 debian/patches/0050-relax-stable-libs.patch | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 49fb395017..50663cb585 100644
--- a/debian/control
+++ b/debian/control
@@ -314,7 +314,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
 #
  ruby-addressable (>= 2.7~),
  ruby-gemojione (>= 3.3~),
- ruby-gon (>= 6.2~),
+ ruby-gon (>= 6.4~),
  ruby-request-store (>= 1.5~),
  ruby-jquery-atwho-rails (>= 1.3.2~),
  ruby-virtus (>= 1.0.5-3~),
diff --git a/debian/patches/0050-relax-stable-libs.patch b/debian/patches/0050-relax-stable-libs.patch
index b015321e24..2c5d7bb549 100644
--- a/debian/patches/0050-relax-stable-libs.patch
+++ b/debian/patches/0050-relax-stable-libs.patch
@@ -310,7 +310,7 @@ gitlab Gemfile
  
  # Detect and convert string character encoding
  gem 'charlock_holmes', '~> 0.7.7'
-@@ -287,9 +287,9 @@
+@@ -287,28 +287,28 @@
  
  gem 'rack-proxy', '~> 0.6.0'
  
@@ -323,7 +323,11 @@ gitlab Gemfile
  
  gem 'addressable', '~> 2.7'
  gem 'gemojione', '~> 3.3'
-@@ -300,15 +300,15 @@
+-gem 'gon', '~> 6.4.0'
++gem 'gon', '~> 6.4'
+ gem 'request_store', '~> 1.5'
+ gem 'base32', '~> 0.3.0'
+ 
  gem "gitlab-license", "~> 1.4"
  
  # Protect against bruteforcing