Merge branch 'deploy'

Conflicts:
	app/controllers/application_controller.rb
	app/views/user_sessions/new.html.haml
	config/environment.rb
	config/geminstaller.yml
	public/stylesheets/sass/quorum.sass

app/controllers/application_controller.rb

@@ -3,6 +3,7 @@
 class ApplicationController < ActionController::Base
   filter_parameter_logging :password
   helper_method :current_user_session, :current_user
+  include ExceptionNotifiable
 
   before_filter :set_gettext_locale
 

config/config-orig.yml

@@ -23,3 +23,6 @@ production:
     user_name: SMTP_USER_NAME
     password: SMTP_PASSWORD
 
+  # Recipients for exception notifications.
+  exception_recipients:
+    - RECIPIENT

config/deploy-orig.rb

@@ -52,6 +52,9 @@
       run "rm -f #{rpath}/config/#{file}"
       run "ln -s #{deploy_to}/shared/config/#{file} #{rpath}/config/#{file}"
     end
+
+    # Remove image source files.
+    run "rm -rf #{rpath}/public/images/sources"
 
     #run "chown www-data #{current_path}/config/environment.rb"
 

config/environment.rb

@@ -72,4 +72,7 @@
 end
 
 # Now set up Haml properties.
-Haml::Template.options[:format] = :html4
+Haml::Template.options[:format] = :html4
+
+# Set up ExceptionNotifier.
+ExceptionNotifier.exception_recipients = APP_CONFIG['exception_recipients']

config/environments/production.rb

@@ -19,9 +19,10 @@
 config.action_mailer.delivery_method = :smtp
 smtp = APP_CONFIG['smtp']
 config.action_mailer.smtp_settings = {
+  :enable_starttls_auto => true,
   :address => smtp['address'],
   :port => smtp['port'],
   :user_name => smtp['user_name'],
   :password => smtp['password'],
-  :authentication => :plain
+  :authentication => (smtp['authentication'] || :plain)
 }

db/migrate/012_add_feed_key_to_users.rb

@@ -1,7 +1,7 @@
 class AddFeedKeyToUsers < ActiveRecord::Migration
   def self.up
     # This is a unique key for each user's RSS feeds
-    execute 'ALTER TABLE users ADD COLUMN feed_key char(32) NOT NULL DEFAULT md5(random())' # can't do computed defaults in Rails migrations yet :(
+    execute "ALTER TABLE users ADD COLUMN feed_key char(32) NOT NULL DEFAULT md5(random() || '')" # can't do computed defaults in Rails migrations yet :(
     add_index :users, :feed_key, :unique => true
   end
 

db/schema.rb

@@ -19,8 +19,8 @@
 
   create_table "commitments", :force => true do |t|
     t.column "event_id", :integer, :null => false
+    t.column "user_id", :integer, :null => false
     t.column "status", :boolean
-    t.column "user_id", :integer
   end
 
   create_table "countries", :force => true do |t|

doc/README_FOR_APP

@@ -2,7 +2,7 @@ Use this README file to introduce your application and point to useful places in
 Run "rake doc:app" to generate API documentation for your models, controllers, helpers, and libraries.
 
 Icon sources:
-circle_*.png:: Marnen Laibow-Koser (hey, I can at least draw a circle!)
+attend_*.png:: Marnen Laibow-Koser (hey, I can at least draw a circle!)
 feed-icon-14x14.png:: http://www.feedicons.com
 pdf-icon-16x16.png:: ??? I no longer remember where this icon came from.
 progress.gif:: Generated by http://www.ajaxload.info/ (background black and transparent, foreground white)