merged in Ken Tolers PR without the updated gemfile.lock - whoops
This commit is contained in:
@@ -199,6 +199,7 @@ GEM
|
|||||||
parallel (1.18.0)
|
parallel (1.18.0)
|
||||||
parser (2.6.5.0)
|
parser (2.6.5.0)
|
||||||
ast (~> 2.4.0)
|
ast (~> 2.4.0)
|
||||||
|
pg (1.2.3)
|
||||||
poltergeist (1.18.1)
|
poltergeist (1.18.1)
|
||||||
capybara (>= 2.1, < 4)
|
capybara (>= 2.1, < 4)
|
||||||
cliver (~> 0.3.1)
|
cliver (~> 0.3.1)
|
||||||
@@ -364,6 +365,7 @@ DEPENDENCIES
|
|||||||
launchy
|
launchy
|
||||||
minitest
|
minitest
|
||||||
mysql2
|
mysql2
|
||||||
|
pg
|
||||||
poltergeist
|
poltergeist
|
||||||
powder
|
powder
|
||||||
pry
|
pry
|
||||||
|
|||||||
Reference in New Issue
Block a user