Update patch to relax pg gem in Gemfile
This commit is contained in:
parent
bfbede42ad
commit
13769c502e
4 changed files with 2 additions and 14 deletions
|
@ -17,7 +17,7 @@ Subject: [PATCH] allow specifying DB choice via ENV variable
|
||||||
-gem 'pg', '~> 1.1', group: :postgres
|
-gem 'pg', '~> 1.1', group: :postgres
|
||||||
+ENV["DB"] ||= "postgresql"
|
+ENV["DB"] ||= "postgresql"
|
||||||
+gem 'mysql2', '~> 0.4.10' if ENV["DB"] == "all" || ENV["DB"] == "mysql"
|
+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 'rugged', '~> 0.27'
|
||||||
gem 'grape-path-helpers', '~> 1.0'
|
gem 'grape-path-helpers', '~> 1.0'
|
||||||
|
|
11
debian/patches/0280-relax-pg.patch
vendored
11
debian/patches/0280-relax-pg.patch
vendored
|
@ -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'
|
|
2
debian/patches/0680-rails-5_2.patch
vendored
2
debian/patches/0680-rails-5_2.patch
vendored
|
@ -13,7 +13,7 @@ Subject: [PATCH 1/6] Upgrade to rails 5.2
|
||||||
--- a/Gemfile
|
--- a/Gemfile
|
||||||
+++ b/Gemfile
|
+++ b/Gemfile
|
||||||
@@ -20,7 +20,7 @@
|
@@ -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 'rugged', '~> 0.27'
|
||||||
-gem 'grape-path-helpers', '~> 1.0'
|
-gem 'grape-path-helpers', '~> 1.0'
|
||||||
|
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
|
@ -3,7 +3,6 @@
|
||||||
0108-make-mysql-optional.patch
|
0108-make-mysql-optional.patch
|
||||||
0110-make-test-dependencies-conditional.patch
|
0110-make-test-dependencies-conditional.patch
|
||||||
0220-relax-webmock.patch
|
0220-relax-webmock.patch
|
||||||
0280-relax-pg.patch
|
|
||||||
0290-skip-peek-mysql2.patch
|
0290-skip-peek-mysql2.patch
|
||||||
0340-relax-httparty.patch
|
0340-relax-httparty.patch
|
||||||
0400-Relax-recaptcha-version.patch
|
0400-Relax-recaptcha-version.patch
|
||||||
|
|
Loading…
Reference in a new issue