From df2ebc67115687468f45c668c8c1bf83675a99ca Mon Sep 17 00:00:00 2001 From: Andrew Cantino Date: Sun, 31 Mar 2013 23:37:49 -0700 Subject: [PATCH] fix failing mail spec and safe_yaml warning --- .ruby-version | 2 +- Gemfile | 1 + Gemfile.lock | 3 ++- app/mailers/system_mailer.rb | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.ruby-version b/.ruby-version index e5fea6c8..2aaf2528 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-1.9.3-p374 +ruby-1.9.3-p392 diff --git a/Gemfile b/Gemfile index 51827b51..a8bf2bb6 100644 --- a/Gemfile +++ b/Gemfile @@ -3,6 +3,7 @@ source 'https://rubygems.org' gem 'rails' gem 'mysql2' gem 'devise' +gem 'safe_yaml', '0.8.6' # Required by rails_admin at the moment. gem 'rails_admin' gem 'kaminari' gem 'bootstrap-kaminari-views' diff --git a/Gemfile.lock b/Gemfile.lock index 079d6d52..ddaaef99 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -195,7 +195,7 @@ GEM rspec-mocks (~> 2.13.0) rufus-scheduler (2.0.18) tzinfo (>= 0.3.23) - safe_yaml (0.8.4) + safe_yaml (0.8.6) sass (3.2.7) sass-rails (3.2.6) railties (~> 3.2.0) @@ -270,6 +270,7 @@ DEPENDENCIES rspec rspec-rails rufus-scheduler + safe_yaml (= 0.8.6) sass-rails (~> 3.2.3) select2-rails system_timer diff --git a/app/mailers/system_mailer.rb b/app/mailers/system_mailer.rb index b88869d9..c010ad9a 100644 --- a/app/mailers/system_mailer.rb +++ b/app/mailers/system_mailer.rb @@ -1,5 +1,5 @@ class SystemMailer < ActionMailer::Base - default from: ENV['EMAIL_FROM_ADDRESS'] + default :from => ENV['EMAIL_FROM_ADDRESS'] || 'you@example.com' def send_message(options) @lines = options[:lines]