realaravinth/debian-mirror-gitlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

relax grape-entity

Browse source
This commit is contained in:
Praveen Arimbrathodiyil 2016-11-30 16:14:40 +05:30
parent 653f70569c
commit 4110fdec98
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
debian/patches/0042-relax-grape-entity.patch vendored
View file

@ -1,15 +1,13 @@
allow newer grape-entity already in debian allow newer grape-entity already in debian
Index: gitlab/Gemfile --- a/Gemfile
=================================================================== +++ b/Gemfile
--- gitlab.orig/Gemfile @@ -68,7 +68,7 @@
+++ gitlab/Gemfile
@@ -68,7 +68,7 @@ gem 'github-linguist', '~> 4.7.0', requi
# API # API
gem 'grape', '~> 0.15.0' gem 'grape', '~> 0.15.0'
-gem 'grape-entity', '~> 0.4.2' -gem 'grape-entity', '~> 0.4.2'
+gem 'grape-entity', '~> 0.5.0' +gem 'grape-entity', '~> 0.6.0'
gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
# Pagination # Pagination

10
debian/patches/052-relax-grape.patch vendored
View file

@ -1,15 +1,13 @@
https://gitlab.com/gitlab-org/gitlab-ce/issues/19670 https://gitlab.com/gitlab-org/gitlab-ce/issues/19670
Index: gitlab/Gemfile --- a/Gemfile
=================================================================== +++ b/Gemfile
--- gitlab.orig/Gemfile @@ -68,7 +68,7 @@
+++ gitlab/Gemfile
@@ -68,7 +68,7 @@ gem 'gollum-rugged_adapter', '~> 0.4.2',
gem 'github-linguist', '~> 4.7', require: 'linguist' gem 'github-linguist', '~> 4.7', require: 'linguist'
# API # API
-gem 'grape', '~> 0.15.0' -gem 'grape', '~> 0.15.0'
+gem 'grape', '~> 0.16.0' +gem 'grape', '~> 0.16.0'
gem 'grape-entity', '~> 0.5.0' gem 'grape-entity', '~> 0.6.0'
gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'