aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Kanis <lars@greiz-reinsdorf.de>2018-01-10 21:02:27 +0100
committerLars Kanis <lars@greiz-reinsdorf.de>2018-01-10 21:55:43 +0100
commit13eff51b1b6a8ea1a21b3fedf0dfa16968b3bebb (patch)
tree9cd7073db05d22456723be47e1c60292ef234a43
parentf820dc2dea3775f6c05c5ca77631ac27a9d3c954 (diff)
downloadrails-13eff51b1b6a8ea1a21b3fedf0dfa16968b3bebb.tar.gz
rails-13eff51b1b6a8ea1a21b3fedf0dfa16968b3bebb.tar.bz2
rails-13eff51b1b6a8ea1a21b3fedf0dfa16968b3bebb.zip
PostgreSQL: Update Gemfile to pg-1.0.0
Queue_classic currently limits pg to "< 0.20". It is therefore not used for rails CI tests. There has been a bull request for a while (by a co-worker of mine), which fixes the incompatibilities and extends dependencies to pg-1.x. This patch add this pull request to the Gemfile as an interim solution, until it is merged.
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock14
2 files changed, 8 insertions, 8 deletions
diff --git a/Gemfile b/Gemfile
index 5d75457870..4303d0596c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -62,7 +62,7 @@ group :job do
gem "sidekiq", require: false
gem "sucker_punch", require: false
gem "delayed_job", require: false
- gem "queue_classic", github: "QueueClassic/queue_classic", branch: "master", require: false, platforms: :ruby
+ gem "queue_classic", github: "Kjarrigan/queue_classic", branch: "update-pg", require: false, platforms: :ruby
gem "sneakers", require: false
gem "que", require: false
gem "backburner", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 21328870d4..23b02fe945 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
GIT
- remote: https://github.com/QueueClassic/queue_classic.git
- revision: cde82d17ded2799ed726dd7b0df6ce1fd4c1b7da
- branch: master
+ remote: https://github.com/Kjarrigan/queue_classic.git
+ revision: dee64b361355d56700ad7aa3b151bf653a617526
+ branch: update-pg
specs:
queue_classic (3.2.0.RC1)
- pg (>= 0.17, < 0.20)
+ pg (>= 0.17, < 2.0)
GIT
remote: https://github.com/matthewd/rb-inotify.git
@@ -340,9 +340,9 @@ GEM
parser (2.4.0.0)
ast (~> 2.2)
path_expander (1.0.2)
- pg (0.19.0)
- pg (0.19.0-x64-mingw32)
- pg (0.19.0-x86-mingw32)
+ pg (1.0.0)
+ pg (1.0.0-x64-mingw32)
+ pg (1.0.0-x86-mingw32)
powerpack (0.1.1)
psych (2.2.4)
public_suffix (3.0.1)