aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Fix request's path_info when a rack app mounted at '/'.Larry Lv2014-06-143-0/+14
| | | | Fixes issue #15511.
* Merge pull request #15692 from sromano/falseClassMatthew Draper2014-06-143-2/+29
|\ | | | | | | ActionController::Parameters#require now accepts FalseClass values
| * ActionController::Parameters#require now accepts FalseClass valuesSergio Romano2014-06-133-1/+24
|/ | | | Fixes #15685.
* Merge pull request #15682 from tgxworld/controller_test_processRafael Mendonça França2014-06-131-2/+5
|\ | | | | Set flash in test session when necessary.
| * Set flash in test session when necessary.Guo Xiang Tan2014-06-121-2/+5
| | | | | | | | `to_session_value` returns nil when empty.
* | Fix parsed token value with header `Authorization token=`.Larry Lv2014-06-133-8/+32
| |
* | Set the status before of setting the response bodyGuillermo Iguaran2014-06-131-2/+2
|/ | | | | | | The 401 status should be set first because setting the response body in a live controller also closes the response to further changes. Fixes #14229.
* only check named_host? once in normalize_hostAaron Patterson2014-06-121-3/+7
|
* lookup subdomain from the options hash once, defaulting to trueAaron Patterson2014-06-121-2/+2
| | | | | if the subdomain wasn't specified, it's the same as if specifying :subdomain as `true`, so we can default the value to `true` safely.
* only extract domain from the options hash onceAaron Patterson2014-06-121-3/+4
|
* reduce calls to `named_host?`Aaron Patterson2014-06-121-2/+6
| | | | | `normalize_host` already calls `named_host?`, so there is no reason to test `named_host?` again in the `extract_domain` method.
* use Ruby for mockingAaron Patterson2014-06-121-1/+1
|
* Removed warning actionpack url.rbJuanito Fatas2014-06-121-2/+2
| | | | | | | | | | Before: /Users/Juan/dev/rails/actionpack/lib/action_dispatch/http/url.rb:95: warning: shadowing outer local variable - port After: No warning
* remove useless to_param callAaron Patterson2014-06-111-1/+1
| | | | | extract_subdomain always returns a string, and to_param calls to_s on a string
* only look up the subdomain onceAaron Patterson2014-06-111-3/+4
|
* scheme should contain one or more charactersAaron Patterson2014-06-111-1/+1
|
* pull the port out of the options hash onceAaron Patterson2014-06-111-2/+3
|
* remove useless nil checkAaron Patterson2014-06-111-2/+2
| | | | | | | | | irb(main):004:0> /foo/ !~ nil => true irb(main):005:0> /foo/ !~ 'bar' => true irb(main):006:0> /foo/ !~ 'foo' => false
* these methods are always called with a tld_parameterAaron Patterson2014-06-111-3/+3
| | | | | remove the default parameter since the methods are always called with a parameter
* rm `same_host?`. The same conditional is two lines down.Aaron Patterson2014-06-111-5/+3
|
* Revert "rm `same_host?`. The same conditional is two lines down."Aaron Patterson2014-06-111-5/+8
| | | | This reverts commit 79469b4b0c05a50e19699bc9b568042add2d4987.
* rm `same_host?`. The same conditional is two lines down.Aaron Patterson2014-06-111-8/+5
|
* Merge pull request #15648 from kuldeepaggarwal/fix-warningsRafael Mendonça França2014-06-112-3/+0
|\ | | | | remove warnings
| * remove warningsKuldeep Aggarwal2014-06-122-3/+0
| | | | | | | | warning: assigned but unused variable - scope_called, path and strexp
* | cache host on the stack so we only look it up onceAaron Patterson2014-06-111-8/+9
| |
* | only pull :protocol from the options hash onceAaron Patterson2014-06-111-2/+3
| |
* | cache protocol on the stack to reduce options hash lookupsAaron Patterson2014-06-111-7/+7
| |
* | eliminate nil checks in normalize_portAaron Patterson2014-06-111-7/+7
| |
* | reduce hash lookups and disconnect normalize_port from the options hashAaron Patterson2014-06-111-9/+9
|/
* Merge pull request #15545 from zuhao/refactor_actionpack_assert_select_testYves Senn2014-06-081-1/+4
|\ | | | | Restore test deliveries for ActionMailer.
| * Restore test deliveries for ActionMailer.Zuhao Wan2014-06-071-1/+4
| |
* | Handle client disconnect during live streamingMatthew Draper2014-06-084-13/+189
| | | | | | | | .. even when the producer is blocked for a write.
* | adds some details to the rationale of converted_arrays [ci skip]Xavier Noria2014-06-072-1/+5
| |
* | adds a regression test for the strong params converted arrays cacheXavier Noria2014-06-071-1/+18
| | | | | | | | This is a regression test for 29844dd.
* | Revert "Convert StrongParameters cache to a hash. This fixes an unbounded"Xavier Noria2014-06-072-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We cannot cache keys because arrays are mutable. We rather want to cache the arrays. This behaviour is tailor-made for the usage pattern strongs params is designed for. In a forthcoming commit I am going to add a test that covers why we need to cache by value. Every strong params instance has a live span of a request, the cache goes away with the object. Since strong params have such a concrete intention, it would be interesting to see if there are actually any real-world use cases that are an actual leak, one that practically may matter. I am not convinced that the theoretical leak has any practical consequences, but if it can be shown there are, then I believe we should either get rid of the cache (which is an optimization), or else wipe it in the mutating API. This reverts commit e63be2769c039e4e9ada523a8497ce3206cc8a9b.
* | [ci skip] Fix capitalizationAkshay Vishnoi2014-06-072-3/+3
| |
* | remove another wasteful AS::SafeBuffer allocationAaron Patterson2014-06-061-1/+1
| |
* | eliminate wasteful AS::SafeBuffer allocationAaron Patterson2014-06-061-1/+1
|/
* Use a frozen Set instance for CGI_VARIABLES.Nathaniel Bibler2014-06-051-8/+21
| | | Also expand the CGI_VARIABLE name listing to multiple lines for cleaner diffs and legibility.
* Avoid misuse of underscore argumentCorey Ward2014-06-051-2/+2
| | | Per convention, underscore-only argument names should be used for unused parameters.
* Merge pull request #15530 from zuhao/refactor_actionpack_reloader_testMatthew Draper2014-06-061-0/+5
|\ | | | | Reset callbacks after test.
| * Reset callbacks after test.Zuhao Wan2014-06-051-0/+5
| | | | | | | | Otherwise the state of callback chain is leaked.
* | Merge pull request #15532 from zuhao/refactor_actionpack_response_testYves Senn2014-06-051-2/+4
|\ \ | | | | | | Restore Response.default_headers after test.
| * | Restore Response.default_headers after test.Zuhao Wan2014-06-051-2/+4
| | |
* | | Avoid hard-coded value in test setup/teardown.Zuhao Wan2014-06-051-1/+2
|/ /
* | Merge pull request #15529 from zuhao/refactor_actionpack_mime_type_testYves Senn2014-06-052-8/+0
|\ \ | |/ |/| Make sure Mime::Type is not altered after tests.
| * Mime::PNG is already defined.Zuhao Wan2014-06-052-8/+0
| |
* | Avoid hardcoded value in test setup/teardown.Zuhao Wan2014-06-051-1/+2
|/
* Merge branch 'master' of github.com:rails/railsAaron Patterson2014-06-048-50/+19
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of github.com:rails/rails: For our build, stick with mail 2.5.x for now Correct result, previously showing wrong result Collapse PG default extractoin of most types to single regex Change wording of explanation about precision & scale of decimal numbers [ci skip] Cleaned up duplicated CHANGELOG entry [ci skip] reuse available belongs_to? method Convert StrongParameters cache to a hash. This fixes an unbounded memory leak demonstrated on @tenderlove's latest blog post: Partially revert deprecation of *_filter Pluralize params Add default_i18n_subject to the guides Fix regression on eager loading association based on SQL query rather than existing column. Relax mail gem constraint from ~> 2.5.4 to ~> 2.5, >= 2.5.4 Keep column defaults in type cast form Return a null column when no column exists for an attribute Refactor XML serializer to not depend on `serialized_attributes` Test the serialized types of virtual columns in XML implement ActiveRecord::Base#pretty_print + changelog Remove duplicated HashWithIndifferentAccess#with_indifferent_access.
| * Merge pull request #15498 from zenspider/fix_memory_leakGuillermo Iguaran2014-06-032-7/+7
| |\ | | | | | | Convert StrongParameters cache to a hash. This fixes an unbounded memory leak