bump pg
This commit is contained in:
parent
de88463d33
commit
f22346a4ae
2 changed files with 4 additions and 4 deletions
4
Gemfile
4
Gemfile
|
|
@ -49,7 +49,7 @@ end
|
|||
# configuration
|
||||
|
||||
group :heroku do
|
||||
gem 'pg'
|
||||
gem 'pg', '0.14.1'
|
||||
gem 'unicorn', '~> 4.3.0', :require => false
|
||||
end
|
||||
|
||||
|
|
@ -59,7 +59,7 @@ gem 'settingslogic', :git => 'https://github.com/binarylogic/settingslogic.git'
|
|||
gem "activerecord-import", "~> 0.2.9"
|
||||
gem 'foreigner', '~> 1.2.1'
|
||||
gem 'mysql2', '0.3.11' if ENV['DB'].nil? || ENV['DB'] == 'all' || ENV['DB'] == 'mysql'
|
||||
gem 'pg' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres'
|
||||
gem 'pg', '0.14.1' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres'
|
||||
gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite'
|
||||
|
||||
# file uploading
|
||||
|
|
|
|||
|
|
@ -317,7 +317,7 @@ GEM
|
|||
multi_json (~> 1.3)
|
||||
omniauth-oauth (~> 1.0)
|
||||
orm_adapter (0.0.7)
|
||||
pg (0.13.2)
|
||||
pg (0.14.1)
|
||||
polyglot (0.3.3)
|
||||
rack (1.4.1)
|
||||
rack-cache (1.2)
|
||||
|
|
@ -523,7 +523,7 @@ DEPENDENCIES
|
|||
omniauth-facebook
|
||||
omniauth-tumblr
|
||||
omniauth-twitter
|
||||
pg
|
||||
pg (= 0.14.1)
|
||||
rack-cors (~> 0.2.4)
|
||||
rack-google-analytics
|
||||
rack-piwik
|
||||
|
|
|
|||
Loading…
Reference in a new issue