Merge pull request #343 from rubysherpas/rails-5

Rails 5
rubysherpas · Jul 12, 2016 · 70f6e37 · 70f6e37
2 parents a21cf4d + d1d854e
commit 70f6e37
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -20,24 +20,18 @@ For Rails 3, please use version 1 of Paranoia:
 gem "paranoia", "~> 1.0"
 ```
 
-For Rails 4, please use version 2 of Paranoia:
+For Rails 4 or 5, please use version 2 of Paranoia:
 
 ``` ruby
 gem "paranoia", "~> 2.0"
 ```
 
-For Rails 5, please use the "core" branch of Paranoia:
+Of course you can install this from GitHub as well from one of these examples:
 
 ``` ruby
-gem 'paranoia', github: 'rubysherpas/paranoia', branch: 'core'
-```
-
-Of course you can install this from GitHub as well:
-
-``` ruby
-gem "paranoia", :github => "rubysherpas/paranoia", :branch => "rails3"
-# or
-gem "paranoia", :github => "rubysherpas/paranoia", :branch => "rails4"
+gem "paranoia", github: "rubysherpas/paranoia", branch: "rails3"
+gem "paranoia", github: "rubysherpas/paranoia", branch: "rails4"
+gem "paranoia", github: "rubysherpas/paranoia", branch: "rails5"
 ```
 
 Then run:
@@ -53,7 +47,7 @@ Updating is as simple as `bundle update paranoia`.
 Run:
 
 ``` shell
-rails generate migration AddDeletedAtToClients deleted_at:datetime:index
+bin/rails generate migration AddDeletedAtToClients deleted_at:datetime:index
 ```
 
 and now you have a migration

diff --git a/lib/paranoia/version.rb b/lib/paranoia/version.rb
@@ -1,3 +1,3 @@
 module Paranoia
-  VERSION = "2.2.0.alpha"
+  VERSION = "2.2.0.pre"
 end