From a5b75b7454050e53af23342e721d7794cef46bd2 Mon Sep 17 00:00:00 2001 From: "Ben A. Morgan" Date: Tue, 12 Jul 2016 13:26:23 -0700 Subject: [PATCH 1/2] update readme for rails5 --- README.md | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 5923a4f9..8a3162c3 100644 --- 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 From d1d854e08139490de7adb8ea1b086ae7ae84a024 Mon Sep 17 00:00:00 2001 From: "Ben A. Morgan" Date: Tue, 12 Jul 2016 13:28:19 -0700 Subject: [PATCH 2/2] bump paranoia to 2.2.0.pre --- lib/paranoia/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/paranoia/version.rb b/lib/paranoia/version.rb index 57cb6f3b..a4ba7155 100644 --- 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