From adec0870be48c94bd8d8884ae3c13e07223d0bbb Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Tue, 18 Aug 2020 20:17:14 +0530 Subject: [PATCH] Relax dependency on ruby-browser --- debian/control | 2 +- debian/patches/0487-relax-browser.patch | 41 +++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 debian/patches/0487-relax-browser.patch diff --git a/debian/control b/debian/control index b4855d43d7..b76665478a 100644 --- a/debian/control +++ b/debian/control @@ -89,7 +89,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # GitLab Pages letsencrypt support ruby-acme-client (>= 2.0.6~), # Browser detection - ruby-browser (>= 2.5~), + ruby-browser (>= 4.2~), # GPG ruby-gpgme (>= 2.0.19~), # LDAP Auth diff --git a/debian/patches/0487-relax-browser.patch b/debian/patches/0487-relax-browser.patch new file mode 100644 index 0000000000..2044fb3331 --- /dev/null +++ b/debian/patches/0487-relax-browser.patch @@ -0,0 +1,41 @@ +From bf53d8ef7eb5dfdfc825267c5bb2ec8c0e17948f Mon Sep 17 00:00:00 2001 +From: Pirate Praveen +Date: Mon, 13 Jul 2020 10:41:30 +0000 +Subject: [PATCH] Update browser rubygem 2.5 to 4.2 + +--- + Gemfile | 2 +- + Gemfile.lock | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +--- a/Gemfile ++++ b/Gemfile +@@ -66,7 +66,7 @@ + gem 'acme-client', '~> 2.0', '>= 2.0.6' + + # Browser detection +-gem 'browser', '~> 2.5' ++gem 'browser', '~> 4.2' + + # GPG + gem 'gpgme', '~> 2.0', '>= 2.0.19' +--- a/Gemfile.lock ++++ b/Gemfile.lock +@@ -125,7 +125,7 @@ + actionpack (>= 5.0) + activemodel (>= 5.0) + brakeman (4.2.1) +- browser (2.5.3) ++ browser (4.2.0) + builder (3.2.4) + bullet (6.0.2) + activesupport (>= 3.0.0) +@@ -1195,7 +1195,7 @@ + bootsnap (~> 1.4.6) + bootstrap_form (~> 4.2.0) + brakeman (~> 4.2) +- browser (~> 2.5) ++ browser (~> 4.2) + bullet (~> 6.0.2) + bundler-audit (~> 0.6.1) + capybara (~> 3.22.0) diff --git a/debian/patches/series b/debian/patches/series index 07a0fd1bc9..a3634aa375 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -13,6 +13,7 @@ 0484-relax-grape-entity.patch 0485-relax-gitlab-sidekiq-fetcher.patch 0486-relax-sidekiq.patch +0487-relax-browser.patch 0500-set-webpack-root.patch 0510-remove-dev-dependencies.patch 0520-add-system-lib-path-for-webpack.patch