From 1b71436c63c5b005b75b67568ab5a780212ca477 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Thu, 28 Mar 2013 00:56:54 +0100
Subject: [PATCH] revert to old behaviour of only having mysql in the
 Gemfile.lock, fixes #4080

---
 Gemfile      | 3 +--
 Gemfile.lock | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index aa94db4dd..295b25dca 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2729dde58..064a0ccb7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -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)