Merge pull request #361 from jhawthorn/master

Version 2.2.0
rubysherpas · Oct 20, 2016 · b29bc4d · b29bc4d
2 parents 8ab2bd0 + f4acaf2
commit b29bc4d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,5 +18,9 @@ matrix:
     - env: RAILS='~> 5.0.0'
       rvm: 2.1.10
   allow_failures:
+    - env: RAILS='~> 4.1.15'
+      rvm: jruby-9.1.0.0
+    - env: RAILS='~> 4.2.6'
+      rvm: jruby-9.1.0.0
     - env: RAILS='~> 5.0.0'
       rvm: jruby-9.1.0.0
diff --git a/README.md b/README.md
@@ -20,16 +20,10 @@ 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 and 5, please use version 2 of Paranoia (2.2 or greater required for rails 5):
 
 ``` ruby
-gem "paranoia", "~> 2.0"
-```
-
-For Rails 5, please use version 2.2.0.pre (pre-release):
-
-``` ruby
-gem "paranoia", "~> 2.2.0.pre"
+gem "paranoia", "~> 2.2"
 ```
 
 Of course you can install this from GitHub as well from one of these examples:

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