[DRE-commits] [gitlab] 01/01: merge test and development, test groups

[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 4fe3bd789715d54f8de4ab35ce59d7ee26fbfeef
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Sep 18 21:53:59 2016 +0530

    merge test and development, test groups
---
 debian/patches/052-relax-grape.patch | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/debian/patches/052-relax-grape.patch b/debian/patches/052-relax-grape.patch
index 8069d00..e132270 100644
--- a/debian/patches/052-relax-grape.patch
+++ b/debian/patches/052-relax-grape.patch
@@ -11,3 +11,15 @@ https://gitlab.com/gitlab-org/gitlab-ce/issues/19670
  gem 'grape-entity', '~> 0.5.0'
  gem 'rack-cors',    '~> 0.4.0', require: 'rack/cors'
  
+@@ -291,9 +291,9 @@
+ 
+ #  gem 'license_finder', '~> 2.1.0', require: false
+ #  gem 'knapsack', '~> 1.11.0'
+-end
++#end
+ 
+-group :test, optional: true do
++#group :test, optional: true do
+   gem 'shoulda-matchers', '~> 2.8', require: false
+   gem 'email_spec', '~> 1.6'
+   gem 'json-schema', '~> 2.6', '>= 2.6.2'

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