From 290aa15f4e84305cd8e8b71d4e4c6d22b83acf97 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Sat, 27 Jun 2020 23:07:23 +0530 Subject: [PATCH] Relax dependency on ruby-grape-entity --- debian/control | 2 +- debian/patches/0780-relax-grape-entity.patch | 11 +++++++++++ debian/patches/series | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 debian/patches/0780-relax-grape-entity.patch diff --git a/debian/control b/debian/control index 48cb19f163..753535f309 100644 --- a/debian/control +++ b/debian/control @@ -99,7 +99,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-grape (>= 1.3.3~), # https://gitlab.com/gitlab-org/gitlab/-/issues/219623 ruby-rack-timeout, - ruby-grape-entity (>= 0.7.1~), + ruby-grape-entity (>= 0.8.0~), ruby-rack-cors (>= 1.0.6~), # GraphQL API ruby-graphql (>= 1.10.5~), diff --git a/debian/patches/0780-relax-grape-entity.patch b/debian/patches/0780-relax-grape-entity.patch new file mode 100644 index 0000000000..96ccb72709 --- /dev/null +++ b/debian/patches/0780-relax-grape-entity.patch @@ -0,0 +1,11 @@ +--- a/Gemfile ++++ b/Gemfile +@@ -80,7 +80,7 @@ + + # API + gem 'grape', '~> 1.3', '>= 1.3.3' +-gem 'grape-entity', '~> 0.7.1' ++gem 'grape-entity', '~> 0.8.0' + gem 'rack-cors', '~> 1.0', '>= 1.0.6', require: 'rack/cors' + + # GraphQL API diff --git a/debian/patches/series b/debian/patches/series index 825650c05c..d48f701c27 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -25,4 +25,5 @@ 0750-fix-relative-paths.patch 0760-update-grape.patch 0770-add-rack-timeout.patch +0780-relax-grape-entity.patch 0790-protobuf-compat.patch