mirror of
https://github.com/Fishwaldo/huginn.git
synced 2025-03-15 19:31:26 +00:00
fix failing mail spec and safe_yaml warning
This commit is contained in:
parent
24049c2c1d
commit
df2ebc6711
4 changed files with 5 additions and 3 deletions
|
@ -1 +1 @@
|
|||
ruby-1.9.3-p374
|
||||
ruby-1.9.3-p392
|
||||
|
|
1
Gemfile
1
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'
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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]
|
||||
|
|
Loading…
Add table
Reference in a new issue