diff options
| author | Ryan Bigg <radarlistener@gmail.com> | 2008-10-01 21:38:16 +0930 |
|---|---|---|
| committer | Ryan Bigg <radarlistener@gmail.com> | 2008-10-01 21:38:16 +0930 |
| commit | dbbd757edd896947e33fdf18ba870b8df5974d62 (patch) | |
| tree | cc0428bee430a18200925acb830f3dc3946e31de /activeresource/lib | |
| parent | 6aca4458e3a1712a4a675ee7bf2cd35701ff75c9 (diff) | |
| parent | 8292c7dfce4b893588860053e50ef60ae9a0609a (diff) | |
| download | rails-dbbd757edd896947e33fdf18ba870b8df5974d62.tar.gz rails-dbbd757edd896947e33fdf18ba870b8df5974d62.tar.bz2 rails-dbbd757edd896947e33fdf18ba870b8df5974d62.zip | |
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'activeresource/lib')
| -rw-r--r-- | activeresource/lib/active_resource/connection.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activeresource/lib/active_resource/connection.rb b/activeresource/lib/active_resource/connection.rb index fe9c2d57fe..273fee3286 100644 --- a/activeresource/lib/active_resource/connection.rb +++ b/activeresource/lib/active_resource/connection.rb @@ -199,7 +199,7 @@ module ActiveResource # Builds headers for request to remote service. def build_request_headers(headers, http_method=nil) - authorization_header.update(default_header).update(headers).update(http_format_header(http_method)) + authorization_header.update(default_header).update(http_format_header(http_method)).update(headers) end # Sets authorization header |