Merge pull request #1088 from tildeio/require-except

Explicitly require ActiveSupport's Hash#except
ruby-grape · Aug 4, 2015 · 52fadb7 · 52fadb7
2 parents 0dfc1cc + fba77de
commit 52fadb7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@ Next Release
 * [#1045](https://github.com/intridea/grape/pull/1045): Do not convert `Rack::Response` to `Rack::Response` in middleware - [@dmitry](https://github.com/dmitry).
 * [#1048](https://github.com/intridea/grape/pull/1048): Only dup `InheritableValues`, remove support for `deep_dup` - [@toddmazierski](https://github.com/toddmazierski/)
 * [#1052](https://github.com/intridea/grape/pull/1052): Reset `description[:params]` when resetting validations - [@marshall-lee](https://github.com/marshall-lee).
+* [#1088](https://github.com/ruby-grape/grape/pull/1088): Support ActiveSupport 3.x by explicitly requiring Hash#except - [@wagenet](https://github.com/wagenet)
 
 0.12.0 (6/18/2015)
 ==================

diff --git a/lib/grape.rb b/lib/grape.rb
@@ -13,6 +13,7 @@
 require 'active_support/core_ext/object/conversions'
 require 'active_support/core_ext/array/extract_options'
 require 'active_support/core_ext/hash/deep_merge'
+require 'active_support/core_ext/hash/except'
 require 'active_support/dependencies/autoload'
 require 'multi_json'
 require 'multi_xml'