Update patch to relax pg gem in Gemfile

This commit is contained in:
Pirate Praveen 2019-03-04 20:01:07 +05:30
parent bfbede42ad
commit 13769c502e
4 changed files with 2 additions and 14 deletions

View file

@ -17,7 +17,7 @@ Subject: [PATCH] allow specifying DB choice via ENV variable
-gem 'pg', '~> 1.1', group: :postgres
+ENV["DB"] ||= "postgresql"
+gem 'mysql2', '~> 0.4.10' if ENV["DB"] == "all" || ENV["DB"] == "mysql"
+gem 'pg', '~> 0.18.2' if ENV["DB"] == "all" || ENV["DB"] == "postgres"
+gem 'pg', '~> 1.1' if ENV["DB"] == "all" || ENV["DB"] == "postgres"
gem 'rugged', '~> 0.27'
gem 'grape-path-helpers', '~> 1.0'

View file

@ -1,11 +0,0 @@
--- a/Gemfile
+++ b/Gemfile
@@ -17,7 +17,7 @@
# Supported DBs
ENV["DB"] ||= "postgresql"
gem 'mysql2', '~> 0.4.10' if ENV["DB"] == "all" || ENV["DB"] == "mysql"
-gem 'pg', '~> 0.18.2' if ENV["DB"] == "all" || ENV["DB"] == "postgres"
+gem 'pg', '~> 0.19' if ENV["DB"] == "all" || ENV["DB"] == "postgres"
gem 'rugged', '~> 0.27'
gem 'grape-path-helpers', '~> 1.0'

View file

@ -13,7 +13,7 @@ Subject: [PATCH 1/6] Upgrade to rails 5.2
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,7 @@
gem 'pg', '~> 0.19' if ENV["DB"] == "all" || ENV["DB"] == "postgres"
gem 'pg', '~> 1.1' if ENV["DB"] == "all" || ENV["DB"] == "postgres"
gem 'rugged', '~> 0.27'
-gem 'grape-path-helpers', '~> 1.0'

View file

@ -3,7 +3,6 @@
0108-make-mysql-optional.patch
0110-make-test-dependencies-conditional.patch
0220-relax-webmock.patch
0280-relax-pg.patch
0290-skip-peek-mysql2.patch
0340-relax-httparty.patch
0400-Relax-recaptcha-version.patch