From eae4e851945edc55c5cc916e887335813f8e72ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Fri, 7 Apr 2017 16:24:49 -0400
Subject: [PATCH] Prepare for the 1.7.1 release

---
 CHANGELOG                          | 6 ++++++
 Gemfile.lock                       | 4 ++--
 lib/inherited_resources/version.rb | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 6c669f82..faf9d72a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+# Version 1.7.1
+
+* Fix regression with `get_resource_ivar` that was returning `false`
+  instead of `nil` when the value was not set.
+* Do not load `ActionController::Base` on boot time.
+
 # Version 1.7.0
 
 * Support Rails 5
diff --git a/Gemfile.lock b/Gemfile.lock
index fbbf2e2f..88e5cecb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    inherited_resources (1.7.0)
+    inherited_resources (1.7.1)
       actionpack (>= 3.2, < 5.1)
       has_scope (~> 0.6)
       railties (>= 3.2, < 5.1)
@@ -134,4 +134,4 @@ DEPENDENCIES
   rails-controller-testing
 
 BUNDLED WITH
-   1.14.3
+   1.14.6
diff --git a/lib/inherited_resources/version.rb b/lib/inherited_resources/version.rb
index d2dabcc1..393b4ffd 100644
--- a/lib/inherited_resources/version.rb
+++ b/lib/inherited_resources/version.rb
@@ -1,3 +1,3 @@
 module InheritedResources
-  VERSION = '1.7.0'.freeze
+  VERSION = '1.7.1'.freeze
 end