app/controllers/devise/unlocks_controller.rb in devise-2.0.0.rc vs app/controllers/devise/unlocks_controller.rb in devise-2.0.0.rc2

- old
+ new

@@ -1,23 +1,21 @@ -class Devise::UnlocksController < ApplicationController +class Devise::UnlocksController < DeviseController prepend_before_filter :require_no_authentication - include Devise::Controllers::InternalHelpers # GET /resource/unlock/new def new build_resource({}) - render_with_scope :new end # POST /resource/unlock def create self.resource = resource_class.send_unlock_instructions(params[resource_name]) if successfully_sent?(resource) respond_with({}, :location => new_session_path(resource_name)) else - respond_with_navigational(resource){ render_with_scope :new } + respond_with(resource) end end # GET /resource/unlock?unlock_token=abcdef def show @@ -25,9 +23,9 @@ if resource.errors.empty? set_flash_message :notice, :unlocked if is_navigational_format? respond_with_navigational(resource){ redirect_to new_session_path(resource) } else - respond_with_navigational(resource.errors, :status => :unprocessable_entity){ render_with_scope :new } + respond_with_navigational(resource.errors, :status => :unprocessable_entity){ render :new } end end end