From 58f60a89af25ec751e23c5e487f51bc8e0bec7ee Mon Sep 17 00:00:00 2001
From: Espen Antonsen <espen@inspired.no>
Date: Sun, 25 Sep 2011 12:57:20 +0800
Subject: [PATCH] assuming heroku is default

---
 Gemfile                            |  9 ++++++---
 Gemfile.lock                       | 19 +++++++++++++++----
 config/environments/development.rb |  1 -
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 23282bc..0264ef9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,13 +7,16 @@ gem 'authlogic'
 gem 'mime-types', :require => 'mime/types'
 gem 'carrierwave'
 
+# -- Heroku
+gem 'heroku'
+
 # -- Database
 # SQLite
-gem 'sqlite3-ruby'
+#gem 'sqlite3-ruby'
 # MySQL:
 #gem 'mysql2', '~> 0.2.7' # Use version 0.3 and up for Rails 3.1
-# PostgreSQL:
-#gem 'pg'
+# PostgreSQL: (use this on Heroku)
+gem 'pg'
 
 # -- Cloud storage
 # AWS S3 support. Can be disabled if using local file system instead of cloud storage.
diff --git a/Gemfile.lock b/Gemfile.lock
index 340fd82..cfefb40 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -30,6 +30,7 @@ GEM
       activesupport (= 3.1.0)
     activesupport (3.1.0)
       multi_json (~> 1.0)
+    addressable (2.2.6)
     arel (2.2.1)
     authlogic (3.0.3)
       activerecord (>= 3.0.7)
@@ -51,8 +52,15 @@ GEM
       nokogiri (~> 1.5.0)
       ruby-hmac
     formatador (0.2.1)
+    heroku (2.8.1)
+      launchy (>= 0.3.2)
+      rest-client (~> 1.6.1)
+      rubyzip
+      term-ansicolor (~> 1.0.5)
     hike (1.2.1)
     i18n (0.6.0)
+    launchy (2.0.5)
+      addressable (~> 2.2.6)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -66,6 +74,7 @@ GEM
       net-ssh (>= 1.99.1)
     net-ssh (2.1.4)
     nokogiri (1.5.0)
+    pg (0.11.0)
     polyglot (0.3.2)
     rack (1.3.3)
     rack-cache (1.0.3)
@@ -93,15 +102,16 @@ GEM
       thor (~> 0.14.6)
     rake (0.9.2)
     rdoc (3.9.4)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     ruby-hmac (0.4.0)
+    rubyzip (0.9.4)
     sprockets (2.0.0)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (!= 1.3.0, ~> 1.1)
-    sqlite3 (1.3.4)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
     subexec (0.1.0)
+    term-ansicolor (1.0.6)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
@@ -116,8 +126,9 @@ DEPENDENCIES
   authlogic
   carrierwave
   fog
+  heroku
   mime-types
   mini_exiftool
   mini_magick
+  pg
   rails (= 3.1.0)
-  sqlite3-ruby
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 2c9ab28..6726ae0 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -11,7 +11,6 @@ Balder::Application.configure do
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send