Merge pull request #432 from activeadmin/release

Prepare for the 1.7.1 release
activeadmin · Apr 11, 2017 · 0839b07 · 0839b07
2 parents eea3aa2 + eae4e85
commit 0839b07
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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
@@ -1,3 +1,3 @@
 module InheritedResources
-  VERSION = '1.7.0'.freeze
+  VERSION = '1.7.1'.freeze
 end