Update CHANGELOG.

2011-03-25 15:40:21 +01:00 · 2011-03-25 15:40:21 +01:00 · 02ae0c22ef
parent edee511cd1
commit 02ae0c22ef
3 changed files with 2 additions and 5 deletions
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@ -1,6 +1,7 @@
 * bug fix
  * Properly ignore path prefix on omniauthable
  * Faster uniqueness queries
+  * Rename active? to active_for_authentication? to avoid conflicts

 == 1.2.rc2

--- a/4
+++ b/4
@ -1,4 +0,0 @@
-* Move integration tests to Capybara
-* Better ORM integration
-* Add support to automatically refresh the access token for OAuth
-* Add test to generators using the new Rails::Generators::TestCase
--- a/app/controllers/devise/registrations_controller.rb
+++ b/app/controllers/devise/registrations_controller.rb
@ -14,7 +14,7 @@ class Devise::RegistrationsController < ApplicationController
    build_resource

    if resource.save
-      if resource.active?
+      if resource.active_for_authentication?
        set_flash_message :notice, :signed_up
        sign_in_and_redirect(resource_name, resource)
      else