diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-01 04:42:55 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-08 20:50:11 -0200 |
| commit | 90a5ec758dfb9698ecfd59bd08340ffecbda1d75 (patch) | |
| tree | 2d942ebc8433f34600e3af8b18291a298262cb12 /actionpack/CHANGELOG.md | |
| parent | 3d25292ae3da2e8cf7a501c69b331a8d08344c59 (diff) | |
| download | rails-90a5ec758dfb9698ecfd59bd08340ffecbda1d75.tar.gz rails-90a5ec758dfb9698ecfd59bd08340ffecbda1d75.tar.bz2 rails-90a5ec758dfb9698ecfd59bd08340ffecbda1d75.zip | |
Merge pull request #8093 from nikitug/keep_app_x_ua_compatible
Fix #8086 (BestStandardsSupport rewrites app X-UA-Compatible header)
Conflicts:
actionpack/CHANGELOG.md
Diffstat (limited to 'actionpack/CHANGELOG.md')
| -rw-r--r-- | actionpack/CHANGELOG.md | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index fffebd87e9..874fc1ead6 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,5 +1,10 @@ ## Rails 3.2.10 (unreleased) ## +* `BestStandardsSupport` middleware now appends it's `X-UA-Compatible` value to app's + returned value if any. Fix #8086 [Backport #8093] + + *Nikita Afanasenko* + * prevent double slashes in engine urls when `Rails.application.default_url_options[:trailing_slash] = true` is set Fix #7842 |