From aeef0b5f6e6e4640f0c69cd9941164ecf67d2ecd Mon Sep 17 00:00:00 2001
From: Ilya Zhitomirskiy <iz268@nyu.edu>
Date: Fri, 9 Sep 2011 12:04:31 -0700
Subject: [PATCH] changed the Gemfile to default to mysql
---
Gemfile | 4 ++--
Gemfile.lock | 4 ----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/Gemfile b/Gemfile
index 6c1a3cb576..f21b7be1ee 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,8 +1,8 @@
source 'http://rubygems.org'
gem 'mysql2', '0.2.6' if ENV['DB'].nil? || ENV['DB'] == "mysql"
-gem 'pg' if ENV['DB'].nil? || ENV['DB'] == "postgres"
-gem 'sqlite3' if ENV['DB'].nil? || ENV['DB'] == "sqlite"
+gem 'pg' if ENV['DB'] == "postgres"
+gem 'sqlite3' if ENV['DB'] == "sqlite"
gem 'rails', '3.0.10'
gem 'foreigner', '0.9.1'
gem 'activerecord-import'
diff --git a/Gemfile.lock b/Gemfile.lock
index 14e35296e0..c0397152b2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -329,7 +329,6 @@ GEM
oa-openid (= 0.2.6)
open4 (1.1.0)
orm_adapter (0.0.5)
- pg (0.11.0)
polyglot (0.3.2)
pyu-ruby-sasl (0.0.3.3)
rack (1.2.3)
@@ -426,7 +425,6 @@ GEM
rack (~> 1.1)
tilt (< 2.0, >= 1.2.2)
spruz (0.2.13)
- sqlite3 (1.3.4)
subexec (0.0.4)
systemu (2.3.0)
term-ansicolor (1.0.6)
@@ -516,7 +514,6 @@ DEPENDENCIES
oauth2-provider (= 0.0.16)
ohai (= 0.5.8)
omniauth (= 0.2.6)
- pg
rails (= 3.0.10)
rails-i18n
rcov
@@ -536,7 +533,6 @@ DEPENDENCIES
selenium-webdriver (= 2.4)
settingslogic (= 2.0.6)
sod!
- sqlite3
thin (= 1.2.11)
twitter (= 1.5.0)
typhoeus
--
GitLab