fix failing mail spec and safe_yaml warning
Andrew Cantino
Se han modificado 4 ficheros con 5 adiciones y 3 borrados
+ 1
- 1
.ruby-version
@@ -1 +1 @@ |
||
| 1 |
-ruby-1.9.3-p374 |
|
| 1 |
+ruby-1.9.3-p392 |
+ 1
- 0
Gemfile
@@ -3,6 +3,7 @@ source 'https://rubygems.org' |
||
| 3 | 3 |
gem 'rails' |
| 4 | 4 |
gem 'mysql2' |
| 5 | 5 |
gem 'devise' |
| 6 |
+gem 'safe_yaml', '0.8.6' # Required by rails_admin at the moment. |
|
| 6 | 7 |
gem 'rails_admin' |
| 7 | 8 |
gem 'kaminari' |
| 8 | 9 |
gem 'bootstrap-kaminari-views' |
+ 2
- 1
Gemfile.lock
@@ -195,7 +195,7 @@ GEM |
||
| 195 | 195 |
rspec-mocks (~> 2.13.0) |
| 196 | 196 |
rufus-scheduler (2.0.18) |
| 197 | 197 |
tzinfo (>= 0.3.23) |
| 198 |
- safe_yaml (0.8.4) |
|
| 198 |
+ safe_yaml (0.8.6) |
|
| 199 | 199 |
sass (3.2.7) |
| 200 | 200 |
sass-rails (3.2.6) |
| 201 | 201 |
railties (~> 3.2.0) |
@@ -270,6 +270,7 @@ DEPENDENCIES |
||
| 270 | 270 |
rspec |
| 271 | 271 |
rspec-rails |
| 272 | 272 |
rufus-scheduler |
| 273 |
+ safe_yaml (= 0.8.6) |
|
| 273 | 274 |
sass-rails (~> 3.2.3) |
| 274 | 275 |
select2-rails |
| 275 | 276 |
system_timer |
+ 1
- 1
app/mailers/system_mailer.rb
@@ -1,5 +1,5 @@ |
||
| 1 | 1 |
class SystemMailer < ActionMailer::Base |
| 2 |
- default from: ENV['EMAIL_FROM_ADDRESS'] |
|
| 2 |
+ default :from => ENV['EMAIL_FROM_ADDRESS'] || 'you@example.com' |
|
| 3 | 3 |
|
| 4 | 4 |
def send_message(options) |
| 5 | 5 |
@lines = options[:lines] |