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

changed the Gemfile to default to mysql

Browse source
This commit is contained in:
Ilya Zhitomirskiy 2011-09-09 12:04:31 -07:00
parent 961272d1bd
commit aeef0b5f6e
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -1,8 +1,8 @@
source 'http://rubygems.org' source 'http://rubygems.org'
gem 'mysql2', '0.2.6' if ENV['DB'].nil? || ENV['DB'] == "mysql" gem 'mysql2', '0.2.6' if ENV['DB'].nil? || ENV['DB'] == "mysql"
gem 'pg' if ENV['DB'].nil? || ENV['DB'] == "postgres" gem 'pg' if ENV['DB'] == "postgres"
gem 'sqlite3' if ENV['DB'].nil? || ENV['DB'] == "sqlite" gem 'sqlite3' if ENV['DB'] == "sqlite"
gem 'rails', '3.0.10' gem 'rails', '3.0.10'
gem 'foreigner', '0.9.1' gem 'foreigner', '0.9.1'
gem 'activerecord-import' gem 'activerecord-import'

4
Gemfile.lock
View file

@ -329,7 +329,6 @@ GEM
oa-openid (= 0.2.6) oa-openid (= 0.2.6)
open4 (1.1.0) open4 (1.1.0)
orm_adapter (0.0.5) orm_adapter (0.0.5)
pg (0.11.0)
polyglot (0.3.2) polyglot (0.3.2)
pyu-ruby-sasl (0.0.3.3) pyu-ruby-sasl (0.0.3.3)
rack (1.2.3) rack (1.2.3)
@ -426,7 +425,6 @@ GEM
rack (~> 1.1) rack (~> 1.1)
tilt (< 2.0, >= 1.2.2) tilt (< 2.0, >= 1.2.2)
spruz (0.2.13) spruz (0.2.13)
sqlite3 (1.3.4)
subexec (0.0.4) subexec (0.0.4)
systemu (2.3.0) systemu (2.3.0)
term-ansicolor (1.0.6) term-ansicolor (1.0.6)
@ -516,7 +514,6 @@ DEPENDENCIES
oauth2-provider (= 0.0.16) oauth2-provider (= 0.0.16)
ohai (= 0.5.8) ohai (= 0.5.8)
omniauth (= 0.2.6) omniauth (= 0.2.6)
pg
rails (= 3.0.10) rails (= 3.0.10)
rails-i18n rails-i18n
rcov rcov
@ -536,7 +533,6 @@ DEPENDENCIES
selenium-webdriver (= 2.4) selenium-webdriver (= 2.4)
settingslogic (= 2.0.6) settingslogic (= 2.0.6)
sod! sod!
sqlite3
thin (= 1.2.11) thin (= 1.2.11)
twitter (= 1.5.0) twitter (= 1.5.0)
typhoeus typhoeus