diff options
| author | Mark McSpadden <markmcspadden@gmail.com> | 2012-02-13 22:22:46 -0600 |
|---|---|---|
| committer | Mark McSpadden <markmcspadden@gmail.com> | 2012-02-13 22:22:46 -0600 |
| commit | 0101d27de606db25c244aae2243f337cfbba6ed0 (patch) | |
| tree | 6db4f6902dfa23833b29576ce2f4746feb3dcbff /activeresource/lib | |
| parent | 11d1bdc09e91f1d77c36b7afeef912de0b94f331 (diff) | |
| download | rails-0101d27de606db25c244aae2243f337cfbba6ed0.tar.gz rails-0101d27de606db25c244aae2243f337cfbba6ed0.tar.bz2 rails-0101d27de606db25c244aae2243f337cfbba6ed0.zip | |
Allow ActiveResource subclasses to inherit headers from parent
Diffstat (limited to 'activeresource/lib')
| -rw-r--r-- | activeresource/lib/active_resource/base.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb index 5ef50b6e03..0c2d070aef 100644 --- a/activeresource/lib/active_resource/base.rb +++ b/activeresource/lib/active_resource/base.rb @@ -588,6 +588,12 @@ module ActiveResource def headers @headers ||= {} + + if superclass != Object && superclass.headers + @headers = superclass.headers.merge(@headers) + else + @headers + end end attr_writer :element_name |