Permalink
Browse files

Preparing production deployment to heroku.

  • Loading branch information...
1 parent 48d4c66 commit 3c8654267fbd04a63f6726276860489d8b1079f3 Ethan Waldo committed Feb 23, 2012
Showing with 20 additions and 16 deletions.
  1. +1 −1 Gemfile
  2. +6 −4 Gemfile.lock
  3. +3 −3 config/environments/production.rb
  4. +10 −8 db/schema.rb
View
@@ -28,7 +28,6 @@ gem 'capistrano'
group :assets do
gem 'execjs'
- gem 'therubyracer'
gem 'sass-rails'
gem 'uglifier'
end
@@ -37,6 +36,7 @@ group :development, :test do
# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
#gem 'ruby-debug'
gem 'ruby-debug19', :require => 'ruby-debug'
+ gem 'rspec-rails'
gem 'jasmine'
gem 'jasmine-headless-webkit'
end
View
@@ -86,7 +86,6 @@ GEM
thor (~> 0.14)
json (1.6.5)
kgio (2.7.2)
- libv8 (3.3.10.2)
linecache19 (0.5.12)
ruby_core_source (>= 0.1.4)
mail (2.4.1)
@@ -167,6 +166,11 @@ GEM
rspec-expectations (2.8.0)
diff-lcs (~> 1.1.2)
rspec-mocks (2.8.0)
+ rspec-rails (2.8.1)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ railties (>= 3.0)
+ rspec (~> 2.8.0)
ruby-debug-base19 (0.11.25)
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
@@ -202,8 +206,6 @@ GEM
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
temple (0.3.5)
- therubyracer (0.9.4)
- libv8 (~> 3.3.10)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
@@ -240,10 +242,10 @@ DEPENDENCIES
omniauth-twitter
pg
rails (= 3.2.0)
+ rspec-rails
ruby-debug19
sass-rails
slim-rails
- therubyracer
uglifier
unicorn
will_paginate
@@ -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
@@ -43,9 +43,9 @@
# config.action_controller.asset_host = "http://assets.example.com"
# Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
- config.assets.precompile += %w( admin.js adminEvents.js adminUsers.js DateTimePicker.js events.js ext_overrides.js raor.js master.css sencha-touch.css sencha-touch.js )
+ config.assets.precompile += %w( admin.js )
config.assets.js_compressor = :uglifier
- #config.assets.css_compressor = :scss
+ config.assets.css_compressor = :scss
# Disable delivery errors, bad email addresses will be ignored
# config.action_mailer.raise_delivery_errors = false
View
@@ -18,8 +18,8 @@
t.integer "user_id"
t.boolean "employment", :default => false, :null => false
t.boolean "employ", :default => false, :null => false
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
t.string "shoutout"
t.boolean "hidden", :default => false, :null => false
t.string "employer"
@@ -31,16 +31,16 @@
t.integer "creator_id"
t.datetime "start_datetime"
t.datetime "end_datetime"
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
end
create_table "user_tokens", :force => true do |t|
t.integer "user_id"
t.string "provider"
t.string "uid"
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
end
create_table "users", :force => true do |t|
@@ -55,11 +55,13 @@
t.string "current_sign_in_ip"
t.string "last_sign_in_ip"
t.string "name"
- t.datetime "created_at"
- t.datetime "updated_at"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
t.integer "roles_mask"
t.string "employer"
t.boolean "remember_employer", :default => false
end
+ add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true
+
end

0 comments on commit 3c86542

Please sign in to comment.