diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc index ff768d36..4c52b183 100644 --- a/CHANGELOG.rdoc +++ b/CHANGELOG.rdoc @@ -1,4 +1,4 @@ -== master +== 3.0.0.rc * enhancements * Rails 4 and Strong Parameters compatibility. (@carlosantoniodasilva, @josevalim, @latortuga, @lucasmazza, @nashby, @rafaelfranca, @spastorino) diff --git a/Gemfile.lock b/Gemfile.lock index d6c11a17..f27f6079 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,7 +12,7 @@ GIT PATH remote: . specs: - devise (2.2.4) + devise (3.0.0.rc) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) diff --git a/README.md b/README.md index a93e8339..5b7dd368 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ You can view the Devise documentation in RDoc format here: http://rubydoc.info/github/plataformatec/devise/master/frames -If you need to use Devise with Rails 2.3, you can always run "gem server" from the command line after you install the gem to access the old documentation. +If you need to use Devise with previous versions of Rails, you can always run "gem server" from the command line after you install the gem to access the old documentation. ### Example applications @@ -90,7 +90,7 @@ Once you have solidified your understanding of Rails and authentication mechanis ## Getting started -Devise 2.0 works with Rails 3.1 onwards. You can add it to your Gemfile with: +Devise 3.0 works with Rails 3.2 onwards. You can add it to your Gemfile with: ```ruby gem 'devise' diff --git a/gemfiles/Gemfile.rails-3.2.x.lock b/gemfiles/Gemfile.rails-3.2.x.lock index abeb3428..16183ff5 100644 --- a/gemfiles/Gemfile.rails-3.2.x.lock +++ b/gemfiles/Gemfile.rails-3.2.x.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - devise (2.2.4) + devise (3.0.0.rc) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) diff --git a/lib/devise/version.rb b/lib/devise/version.rb index 156075e5..f22d135f 100644 --- a/lib/devise/version.rb +++ b/lib/devise/version.rb @@ -1,3 +1,3 @@ module Devise - VERSION = "2.2.4".freeze + VERSION = "3.0.0.rc".freeze end