Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mailer compatibility with Devise 2.2.0 #261

Merged
merged 2 commits into from
Jan 10, 2013
Merged

Mailer compatibility with Devise 2.2.0 #261

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c0993c
Change method signature of invitation_instructions mailer
tmikoss Jan 9, 2013
e40d912
Make it play nice with older versions of devise
tmikoss Jan 9, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions lib/devise_invitable/mailer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
require 'devise/version'

module DeviseInvitable
module Mailer

# Deliver an invitation email
def invitation_instructions(record)
devise_mail(record, :invitation_instructions)
def invitation_instructions(record, opts={})
# optional arguments introduced in Devise 2.2.0, remove check once support for < 2.2.0 is dropped.
if Gem::Version.new(Devise::VERSION.dup) < Gem::Version.new('2.2.0')
devise_mail(record, :invitation_instructions)
else
devise_mail(record, :invitation_instructions, opts)
end
end
end
end