Permalink
Browse files

Try to get Heroku working again (still on bamboo-mri-1.9.2).

  • Loading branch information...
1 parent 459688c commit d159ed7f4d1812b0f210f4a23c6a10fbe94cf301 @esambo committed Sep 17, 2011
Showing with 16 additions and 2 deletions.
  1. +6 −1 Gemfile
  2. +9 −0 Gemfile.lock
  3. +1 −1 config/environments/production.rb
View
@@ -5,11 +5,11 @@ gem 'rails', '3.1.0'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
-gem 'sqlite3'
gem 'validates_timeliness'
gem 'chronic_duration'
gem 'ruby-duration'
gem 'devise'
+gem 'thin'
#potential:
# gem 'chronic'
@@ -18,6 +18,7 @@ gem 'devise'
group :development, :test do
gem 'rspec-rails'
+ gem 'sqlite3'
end
group :development do
@@ -50,6 +51,10 @@ group :test do
# gem 'hpricot', "~>0.8.2" #required by 'mofo'
end
+group :production do
+ gem 'pg'
+end
+
# Gems used only for assets and not required
# in production environments by default.
group :assets do
View
@@ -72,6 +72,7 @@ GEM
cucumber (~> 1.0.6)
nokogiri (>= 1.5.0)
daemon_controller (0.2.6)
+ daemons (1.1.4)
database_cleaner (0.6.7)
devise (1.4.5)
bcrypt-ruby (~> 3.0)
@@ -82,6 +83,7 @@ GEM
mail (~> 2.2)
rspec (~> 2.0)
erubis (2.7.0)
+ eventmachine (0.12.10)
execjs (1.2.6)
multi_json (~> 1.0)
fastthread (1.0.7)
@@ -120,6 +122,7 @@ GEM
fastthread (>= 1.0.1)
rack
rake (>= 0.8.1)
+ pg (0.11.0)
polyglot (0.3.2)
powder (0.1.6)
thor (>= 0.11.5)
@@ -208,6 +211,10 @@ GEM
syntax (1.0.0)
sys-uname (0.8.6)
term-ansicolor (1.0.6)
+ thin (1.2.11)
+ daemons (>= 1.0.9)
+ eventmachine (>= 0.12.6)
+ rack (>= 1.0.0)
thor (0.14.6)
tilt (1.3.3)
time_travel (0.1.0)
@@ -244,6 +251,7 @@ DEPENDENCIES
heroku
jquery-rails
passenger
+ pg
powder
pry
pry-doc
@@ -256,6 +264,7 @@ DEPENDENCIES
spork
sqlite3
syntax
+ thin
time_travel
uglifier
validates_timeliness
@@ -9,7 +9,7 @@
config.action_controller.perform_caching = true
# Disable Rails's static asset server (Apache or nginx will already do this)
- config.serve_static_assets = false
+ config.serve_static_assets = true
# Compress JavaScripts and CSS
config.assets.compress = true

0 comments on commit d159ed7

Please sign in to comment.