relax grape-entity

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

View file

@ -1,15 +1,13 @@
allow newer grape-entity already in debian
Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -68,7 +68,7 @@ gem 'github-linguist', '~> 4.7.0', requi
--- a/Gemfile
+++ b/Gemfile
@@ -68,7 +68,7 @@
# API
gem 'grape', '~> 0.15.0'
-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'
# Pagination

View file

@ -1,15 +1,13 @@
https://gitlab.com/gitlab-org/gitlab-ce/issues/19670
Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -68,7 +68,7 @@ gem 'gollum-rugged_adapter', '~> 0.4.2',
--- a/Gemfile
+++ b/Gemfile
@@ -68,7 +68,7 @@
gem 'github-linguist', '~> 4.7', require: 'linguist'
# API
-gem 'grape', '~> 0.15.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'