diff --git a/debian/patches/0006-loosen-grape.patch b/debian/patches/0006-loosen-grape.patch new file mode 100644 index 0000000000..9ef4b66225 --- /dev/null +++ b/debian/patches/0006-loosen-grape.patch @@ -0,0 +1,15 @@ +Forwarded: https://gitlab.com/gitlab-org/gitlab-ce/issues/2761 + +Index: gitlab/Gemfile +=================================================================== +--- gitlab.orig/Gemfile ++++ gitlab/Gemfile +@@ -62,7 +62,7 @@ gem 'gollum-lib', '~> 4.0.2' + gem "gitlab-linguist", "~> 3.0.1", require: "linguist" + + # API +-gem "grape", "~> 0.6.1" ++gem "grape", "~> 0.6" + gem "grape-entity", "~> 0.4.2" + gem 'rack-cors', require: 'rack/cors' + diff --git a/debian/patches/series b/debian/patches/series index 5e279d782c..84e9310357 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ loosen-rails-version.patch 0003-loosen-doorkeeper.patch 0004-loosen-rack-oauth2.patch 0005-use-debian-omniauth-ldap.patch +0006-loosen-grape.patch