Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update docs and CHANGELOG based on the 1.1.3 release from v1.1 branch.

  • Loading branch information...
commit f96061b35064f8a3c459a0a54eb5ead445dcbd9c 1 parent aaeb053
@josevalim josevalim authored
Showing with 16 additions and 16 deletions.
  1. +9 −3 CHANGELOG.rdoc
  2. +7 −13 README.rdoc
View
12 CHANGELOG.rdoc
@@ -6,17 +6,23 @@
* Added OAuth 2 support
* sign_out_via is available in the router to configure the method used for sign out (by github.com/martinrehfeld)
* Improved Ajax requests handling in failure app (by github.com/spastorino)
- * Add reply-to to e-mail headers by default
* Add request_keys to easily use request specific values (like subdomain) in authentication
* bugfix
* after_sign_in_path_for always receives a resource
- * Updated the views generator to respect the rails :template_engine option (by github.com/fredwu)
* Do not execute Warden::Callbacks on Devise::TestHelpers (by github.com/sgronblo)
- * Check the type of HTTP Authentication before using Basic headers
* Password recovery and account unlocking takes into account authentication keys (by github.com/RStankov)
+
+== 1.1.3
+
+* bugfix
+ * Add reply-to to e-mail headers by default
+ * Updated the views generator to respect the rails :template_engine option (by github.com/fredwu)
+ * Check the type of HTTP Authentication before using Basic headers
* Avoid invalid_salt errors by checking salt presence (by github.com/thibaudgg)
* Forget user deletes the right cookie before logout, not remembering the user anymore (by github.com/emtrane)
+ * Fix for failed first-ever logins on PostgreSQL where column default is nil (by github.com/bensie)
+ * :default options is now honored in migrations
== 1.1.2
View
20 README.rdoc
@@ -7,7 +7,7 @@ Devise is a flexible authentication solution for Rails based on Warden. It:
* Allows you to have multiple roles (or models/scopes) signed in at the same time;
* Is based on a modularity concept: use just what you really need.
-Right now it's composed of 11 modules:
+It's composed of 11 modules:
* Database Authenticatable: encrypts and stores a password in the database to validate the authenticity of an user while signing in. The authentication can be done both through POST requests or HTTP Basic Authentication.
* Token Authenticatable: signs in a user based on an authentication token (also known as "single access token"). The token can be given both through query string or HTTP Basic Authentication.
@@ -71,14 +71,6 @@ http://github.com/plataformatec/devise/wiki/Contributing
== Installation
-=== Rails 2.3.x
-
-Devise 1.1 supports Rails 3 and is NOT backward compatible. If you want to use the Rails 2.3.x version, see the README in the v1.0 branch:
-
-http://github.com/plataformatec/devise/tree/v1.0
-
-=== Rails 3
-
You can use the latest Rails 3 gem with the latest Devise gem:
gem install devise
@@ -93,6 +85,8 @@ The generator will install an initializer which describes ALL Devise's configura
Replace MODEL by the class name you want to add devise, like User, Admin, etc. This will create a model (if one does not exist) and configure it with default Devise modules. The generator will also create a migration file (if your ORM support them) and configure your routes. Continue reading this file to understand exactly what the generator produces and how to use it.
+Support for Rails 2.3.x can be found by installing Devise 1.0.x from the v1.0 branch.
+
== Getting started
This is a walkthrough with all steps you need to setup a devise resource, including model, migration, route files, and optional configuration.
@@ -301,10 +295,6 @@ If you're using RSpec and want the helpers automatically included within all +de
Do not use such helpers for integration tests such as Cucumber or Webrat. Instead, fill in the form or explicitly set the user in session. For more tips, check the wiki (http://wiki.github.com/plataformatec/devise).
-=== Other ORMs
-
-Devise supports ActiveRecord (default) and Mongoid. To choose other ORM, you just need to require it in the initializer file.
-
=== OAuth2
Devise comes with OAuth support out of the box if you're using Devise from the git repository (for now). You can read more about OAuth2 support in the wiki:
@@ -312,6 +302,10 @@ Devise comes with OAuth support out of the box if you're using Devise from the g
* http://github.com/plataformatec/devise/wiki/OAuth2:-Overview
* http://github.com/plataformatec/devise/wiki/OAuth2:-Testing
+=== Other ORMs
+
+Devise supports ActiveRecord (default) and Mongoid. To choose other ORM, you just need to require it in the initializer file.
+
=== Migrating from other solutions
Devise implements encryption strategies for Clearance, Authlogic and Restful-Authentication. To make use of these strategies, set the desired encryptor in the encryptor initializer config option. You might also need to rename your encrypted password and salt columns to match Devise's fields (encrypted_password and password_salt).
Please sign in to comment.
Something went wrong with that request. Please try again.