Merge branch 'production'

mezis · May 21, 2013 · 869042d · 869042d
2 parents c905053 + 9cdaf4c
commit 869042d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/Rakefile b/Rakefile
@@ -4,4 +4,6 @@
 
 require File.expand_path('../config/application', __FILE__)
 
+require 'rake_ext/raven'
+
 AppFab::Application.load_tasks
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -22,6 +22,7 @@ def _sign_in_from_hash(provider)
     Rails.logger.info _auth_hash
     login = Login.find_or_create_from_auth_hash!(_auth_hash)
     login.auth_provider_data[provider.to_s] ||= _auth_hash.to_hash
+    login.remember_me = true
     login.save!
 
     return_to = session[:return_to]

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -49,7 +49,7 @@
 
   # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
   # config.assets.precompile += %w( search.js )
-  config.assets.precompile += %w( pages/welcome.css )
+  config.assets.precompile += %w( email.css pages/welcome.css )
 
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false
@@ -75,6 +75,5 @@
   # with SQLite, MySQL, and PostgreSQL)
   # config.active_record.auto_explain_threshold_in_seconds = 0.5
 
-
   config.roadie.provider = Roadie::FilesystemProvider.new('/assets', Rails.root.join('public', 'assets'))
 end
diff --git a/lib/rake_ext/raven.rb b/lib/rake_ext/raven.rb
@@ -0,0 +1,13 @@
+require 'rake'
+
+Rake::DSL.module_eval do
+  def task_with_raven(*args, &block)
+    task_without_raven(*args) do |*block_args|
+      Raven.capture do
+        block.call(*block_args)
+      end
+    end
+  end
+
+  alias_method_chain :task, :raven
+end