Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions app/controllers/devise_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def require_no_authentication
no_input = devise_mapping.no_input_strategies

authenticated = if no_input.present?
args = no_input.dup.push :scope => resource_name
args = no_input.dup.push :scope => resource_name
warden.authenticate?(*args)
else
warden.authenticated?(resource_name)
Expand All @@ -106,10 +106,10 @@ def require_no_authentication
# and instructions were sent.
def successfully_sent?(resource)
notice = if Devise.paranoid
resource.errors.clear
resource.errors.clear
:send_paranoid_instructions
elsif resource.errors.empty?
:send_instructions
:send_instructions
end

if notice
Expand Down Expand Up @@ -161,7 +161,7 @@ def is_navigational_format?
# Override prefixes to consider the scoped view.
def _prefixes #:nodoc:
@_prefixes ||= if self.class.scoped_views?
super.unshift("#{devise_mapping.scoped_path}/#{controller_name}")
super.unshift("#{devise_mapping.scoped_path}/#{controller_name}")
else
super
end
Expand Down
2 changes: 1 addition & 1 deletion lib/generators/devise/orm_helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def model_contents
end

def model_exists?
File.exists?(File.join(destination_root, model_path))
File.exist?(File.join(destination_root, model_path))
end

def migration_exists?(table_name)
Expand Down