Skip to content

Commit fba77de

Browse files
committed
Explicitly require ActiveSupport's Hash#except
This allows Grape to be run with ActiveSupport 3, without Rails. In ActiveSupport 4, this file ended up being required as a dependency of `active_support/core_ext/object/conversions`. Also, Rails itself includes this file.
1 parent 0dfc1cc commit fba77de

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Next Release
1717
* [#1045](https://github.com/intridea/grape/pull/1045): Do not convert `Rack::Response` to `Rack::Response` in middleware - [@dmitry](https://github.com/dmitry).
1818
* [#1048](https://github.com/intridea/grape/pull/1048): Only dup `InheritableValues`, remove support for `deep_dup` - [@toddmazierski](https://github.com/toddmazierski/)
1919
* [#1052](https://github.com/intridea/grape/pull/1052): Reset `description[:params]` when resetting validations - [@marshall-lee](https://github.com/marshall-lee).
20+
* [#1088](https://github.com/ruby-grape/grape/pull/1088): Support ActiveSupport 3.x by explicitly requiring Hash#except - [@wagenet](https://github.com/wagenet)
2021

2122
0.12.0 (6/18/2015)
2223
==================

lib/grape.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
require 'active_support/core_ext/object/conversions'
1414
require 'active_support/core_ext/array/extract_options'
1515
require 'active_support/core_ext/hash/deep_merge'
16+
require 'active_support/core_ext/hash/except'
1617
require 'active_support/dependencies/autoload'
1718
require 'multi_json'
1819
require 'multi_xml'

0 commit comments

Comments
 (0)