mirror of
https://github.com/heartcombo/devise.git
synced 2022-11-09 12:18:31 -05:00
Fix requiring warden
This commit is contained in:
parent
0eb8b3b7cc
commit
59a9f38983
2 changed files with 9 additions and 11 deletions
|
@ -32,9 +32,9 @@ class Notifier < ::ActionMailer::Base
|
|||
# devise:
|
||||
# notifier:
|
||||
# confirmation_instructions: '...'
|
||||
# user:
|
||||
# notifier:
|
||||
# confirmation_instructions: '...'
|
||||
# user:
|
||||
# notifier:
|
||||
# confirmation_instructions: '...'
|
||||
def translate(record, key)
|
||||
I18n.t(:"#{record.class.name.downcase}.#{key}",
|
||||
:scope => [:devise, :notifier],
|
||||
|
|
|
@ -1,11 +1,9 @@
|
|||
#begin
|
||||
# require 'warden'
|
||||
#rescue
|
||||
# gem 'hassox-warden'
|
||||
# require 'warden'
|
||||
#end
|
||||
|
||||
require File.join(File.dirname(__FILE__), '..', 'warden', 'lib', 'warden')
|
||||
begin
|
||||
require 'warden'
|
||||
rescue
|
||||
gem 'hassox-warden'
|
||||
require 'warden'
|
||||
end
|
||||
|
||||
module Devise
|
||||
ALL = [:authenticable, :confirmable, :recoverable, :rememberable, :validatable].freeze
|
||||
|
|
Loading…
Add table
Reference in a new issue