diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-11-29 15:06:07 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-11-29 15:06:07 +0000 |
| commit | eb1432f9992275df485f8502ad3ab6f7c8d494b7 (patch) | |
| tree | ec20310d47c7f4e4cd136ac1671b32db4a379ea7 /app/controllers/application_controller.rb | |
| parent | 5ddd0620f8023c4bbf7d82e61f841dadd73bb7ba (diff) | |
| parent | 20089cf7b5045d504b7240bc92e2b6068fcc2246 (diff) | |
Merge remote-tracking branch 'origin/merged-rails-3-2-assset-pipeline' into rails-3-develop
Conflicts:
Gemfile.lock
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index cbdffc441..161a82b26 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -138,7 +138,9 @@ class ApplicationController < ActionController::Base backtrace = Rails.backtrace_cleaner.clean(exception.backtrace, :silent) message << " " << backtrace.join("\n ") Rails.logger.fatal("#{message}\n\n") - ExceptionNotifier::Notifier.exception_notification(request.env, exception).deliver + if !AlaveteliConfiguration.exception_notifications_from.blank? && !AlaveteliConfiguration.exception_notifications_to.blank? + ExceptionNotifier::Notifier.exception_notification(request.env, exception).deliver + end @status = 500 end respond_to do |format| |