nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert to old behaviour of only having mysql in the Gemfile.lock, fixes #4080

Browse source
This commit is contained in:
Jonne Haß 2013-03-28 00:56:54 +01:00
parent 18f260a06f
commit 1b71436c63
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Gemfile
View file

@ -30,8 +30,7 @@ gem 'rack-cors', '0.2.7', :require => 'rack/cors'
# Database
ENV['DB'] ||= 'mysql' if ENV['RAILS_ENV'] == 'production'
ENV['DB'] ||= 'all' unless ENV['TRAVIS']
ENV['DB'] ||= 'mysql'
gem 'mysql2', '0.3.11' if ENV['DB'] == 'all' || ENV['DB'] == 'mysql'
gem 'pg', '0.14.1' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres'

2
Gemfile.lock
View file

@ -250,7 +250,6 @@ GEM
multi_json (~> 1.3)
omniauth-oauth (~> 1.0)
orm_adapter (0.4.0)
pg (0.14.1)
polyglot (0.3.3)
pry (0.9.12)
coderay (~> 1.0.5)
@ -458,7 +457,6 @@ DEPENDENCIES
omniauth-facebook (= 1.4.1)
omniauth-tumblr (= 1.1)
omniauth-twitter (= 0.0.15)
pg (= 0.14.1)
rack-cors (= 0.2.7)
rack-google-analytics (= 0.11.0)
rack-piwik (= 0.2.2)