From f59ce6dfbdd9e405d4293a3f6a74e56ef5a17d24 Mon Sep 17 00:00:00 2001
From: Richard Wilson <richard@freerunningtech.com>
Date: Mon, 13 Jun 2016 09:39:20 -0700
Subject: [PATCH] Bump to 1.15.0

Adds rails 5 support.
---
 CHANGELOG.rdoc        | 6 +++++-
 lib/cancan/version.rb | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index 6189fdc4..e747abcc 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -2,7 +2,11 @@ Develop
 
 Unreleased
 
-1.14.0 (May 14th, 2016
+1.15.0 (June 13th, 2016)
+
+* Add support for Rails 5 (craig1410)
+
+1.14.0 (May 14th, 2016)
 
 * Use cover for ranges
 * Add support for rails 4 enum's (markpmitchell)
diff --git a/lib/cancan/version.rb b/lib/cancan/version.rb
index bde64f7c..701d1335 100644
--- a/lib/cancan/version.rb
+++ b/lib/cancan/version.rb
@@ -1,3 +1,3 @@
 module CanCan
-  VERSION = "1.14.0"
+  VERSION = "1.15.0"
 end