diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2012-02-07 10:34:38 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2012-02-07 10:34:38 -0800 |
| commit | 12c3b3d65738eccb7b7a043b2a8a1ba65a46d34e (patch) | |
| tree | 9866451e41e9562a51bdc91f732794d7db979d6c /actionpack/lib/action_dispatch | |
| parent | 275c3a1cb3d0f38d1a28b1a8d6145a4d7e379acc (diff) | |
| parent | 30e5503d004971a8c7ddb039f9023dca3a6bdcd7 (diff) | |
| download | rails-12c3b3d65738eccb7b7a043b2a8a1ba65a46d34e.tar.gz rails-12c3b3d65738eccb7b7a043b2a8a1ba65a46d34e.tar.bz2 rails-12c3b3d65738eccb7b7a043b2a8a1ba65a46d34e.zip | |
Merge pull request #4928 from rmm5t/fix_force_ssl_redirect_with_params_master
Fix force_ssl redirect with params
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index c96999d23f..8e3975e369 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -567,6 +567,7 @@ module ActionDispatch path_addition, params = generate(path_options, path_segments || {}) path << path_addition + params.merge!(options[:params] || {}) ActionDispatch::Http::URL.url_for(options.merge!({ :path => path, |