aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2018-01-11 14:31:37 -0500
committerRafael Mendonça França <rafaelmfranca@gmail.com>2018-01-11 14:31:37 -0500
commit181836d894b0a198b150583fe4ac97dc70badcea (patch)
tree7706aad8e8d23f91ca9d525eb797baa77226ccba /Gemfile.lock
parent5e8c79a6fafb8d7a84c272b3c9a0474a0d01b471 (diff)
parent13eff51b1b6a8ea1a21b3fedf0dfa16968b3bebb (diff)
downloadrails-181836d894b0a198b150583fe4ac97dc70badcea.tar.gz
rails-181836d894b0a198b150583fe4ac97dc70badcea.tar.bz2
rails-181836d894b0a198b150583fe4ac97dc70badcea.zip
Merge pull request #31671 from larskanis/pg-1.0
PostgreSQL: Allow pg-1.0 gem to be used with ActiveRecord
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock14
1 files changed, 7 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 2869179e4c..e54d232ce1 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)