[DRE-commits] [gitlab] 02/05: relax grape-entity

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository gitlab.

commit 4110fdec98e7c882d0cd886061505a6c96d2c759
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Nov 30 16:14:40 2016 +0530

    relax grape-entity
---
 debian/patches/0042-relax-grape-entity.patch | 10 ++++------
 debian/patches/052-relax-grape.patch         | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/debian/patches/0042-relax-grape-entity.patch b/debian/patches/0042-relax-grape-entity.patch
index 45be482..3b7e59a 100644
--- a/debian/patches/0042-relax-grape-entity.patch
+++ b/debian/patches/0042-relax-grape-entity.patch
@@ -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
diff --git a/debian/patches/052-relax-grape.patch b/debian/patches/052-relax-grape.patch
index 0d4fd13..f216979 100644
--- a/debian/patches/052-relax-grape.patch
+++ b/debian/patches/052-relax-grape.patch
@@ -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'
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab.git