From 1a8395f96ebe9d032aa2e620cba9387a0fd54ddf Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Tue, 30 Jun 2020 01:03:40 +0530 Subject: [PATCH] Drop patches (changes already included in other patches) --- debian/patches/0770-add-rack-timeout.patch | 18 ------------------ debian/patches/0780-relax-grape-entity.patch | 11 ----------- debian/patches/series | 2 -- 3 files changed, 31 deletions(-) delete mode 100644 debian/patches/0770-add-rack-timeout.patch delete mode 100644 debian/patches/0780-relax-grape-entity.patch diff --git a/debian/patches/0770-add-rack-timeout.patch b/debian/patches/0770-add-rack-timeout.patch deleted file mode 100644 index 6b80080df1..0000000000 --- a/debian/patches/0770-add-rack-timeout.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/Gemfile -+++ b/Gemfile -@@ -80,7 +80,6 @@ - - # API - gem 'grape', '~> 1.3', '>= 1.3.3' --gem 'rack-timeout' - gem 'grape-entity', '~> 0.7.1' - gem 'rack-cors', '~> 1.0', '>= 1.0.6', require: 'rack/cors' - -@@ -160,6 +159,7 @@ - - # Application server - gem 'rack', '~> 2.0', '>= 2.0.9' -+gem 'rack-timeout', require: false - - group :unicorn do - gem 'unicorn', '~> 5.5' diff --git a/debian/patches/0780-relax-grape-entity.patch b/debian/patches/0780-relax-grape-entity.patch deleted file mode 100644 index 96ccb72709..0000000000 --- a/debian/patches/0780-relax-grape-entity.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 7f92304b59..3d445b75dc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -25,6 +25,4 @@ 0741-add-graphql-tag.patch 0750-fix-relative-paths.patch 0760-update-grape.patch -0770-add-rack-timeout.patch -0780-relax-grape-entity.patch 0790-protobuf-compat.patch