[DRE-commits] [gitlab] 01/02: Relax httparty and oj in Gemfile

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master-8
in repository gitlab.

commit 10976422e9dcfaa93c80c43e93049b81f272ed0e
Author: Pirate Praveen <praveen at debian.org>
Date:   Thu Nov 30 12:40:36 2017 +0530

    Relax httparty and oj in Gemfile
---
 debian/patches/0230-relax-httparty-oj.patch | 20 ++++++++++++++++++++
 debian/patches/series                       |  1 +
 2 files changed, 21 insertions(+)

diff --git a/debian/patches/0230-relax-httparty-oj.patch b/debian/patches/0230-relax-httparty-oj.patch
new file mode 100644
index 0000000..2ebfd48
--- /dev/null
+++ b/debian/patches/0230-relax-httparty-oj.patch
@@ -0,0 +1,20 @@
+--- a/Gemfile
++++ b/Gemfile
+@@ -140,7 +140,7 @@
+ gem 'redis-namespace', '~> 1.5', '>= 1.5.2'
+ 
+ # HTTP requests
+-gem 'httparty', '~> 0.13.3'
++gem 'httparty', '~> 0.13'
+ 
+ # Colored output to console
+ gem 'rainbow', '~> 2.1'
+@@ -206,7 +206,7 @@
+ gem 'charlock_holmes', '~> 0.7.3'
+ 
+ # Faster JSON
+-gem 'oj', '~> 2.17', '>= 2.17.4'
++gem 'oj', '>= 2.17.4'
+ 
+ # Parse time & duration
+ gem 'chronic', '~> 0.10.2'
diff --git a/debian/patches/series b/debian/patches/series
index 15d9a12..ee05ecb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,5 +9,6 @@ pid-log-paths.patch
 0200-remove-order-dependency-in-label-finder-spec.patch
 0210-use-jquery-ui-rails6.patch
 0220-relax-dependencies.patch
+0230-relax-httparty-oj.patch
 0300-git-2-11-support.patch
 cve-2017-0882.patch

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