aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #15385 from zuhao/refactor_actionpack_render_other_testSantiago Pastorino2014-05-281-4/+7
|\ \ \ \ \ | |/ / / / |/| | | | Add and remove renderer inside the test to prevent leak.
| * | | | Add and remove renderer inside the test to prevent leak.Zuhao Wan2014-05-281-4/+7
| |/ / /
* | | | Merge pull request #15383 from ↵Yves Senn2014-05-281-10/+8
|\ \ \ \ | |/ / / |/| | | | | | | | | | | zuhao/refactor_actionpack_localized_templates_test Move I18n.locale setting into setup and teardown.
| * | | Move I18n.locale setting into setup and teardown.Zuhao Wan2014-05-281-10/+8
| |/ /
* / / Add with_default_charset helper.Zuhao Wan2014-05-281-12/+20
|/ /
* | Deprecate all *_filter callbacks in favor of *_action callbacksRafael Mendonça França2014-05-275-214/+224
| | | | | | | | | | This is the continuation of the work started at 9d62e04838f01f5589fa50b0baa480d60c815e2c
* | rm dead codeAaron Patterson2014-05-271-5/+0
| |
* | PARAMETERS_KEY is only used in the request, so move the constant thereAaron Patterson2014-05-273-9/+9
| |
* | Merge branch 'constraints'Aaron Patterson2014-05-2711-75/+85
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * constraints: rm reset_parameters because we automatically do it from 9ca4839a move path_parameter encoding check to the request object dispatcher doesn't need `call` anymore call `serve` with the request on dispatchers constraints class does not need the request class anymore give all endpoints a superclass skip the build business if the stack is empty stop hardcoding path_parameters and get it from the request we do not need to cache rack_app a redirect is not a dispatcher by definition, so eliminate test push is_a check up to where the Constraints object is allocated pass the request object to the application pass a request to `matches?` so we can avoid creating excess requests nothing is passed to `rack_app` anymore, so rm the params one fewer is_a check Constraints#app should never return another Constraints object, so switch to if statement eliminate dispatcher is_a checks push is_a?(Dispatcher) check in to one place Always construct route objects with Constraint objects Conflicts: actionpack/lib/action_controller/metal.rb
| * | rm reset_parameters because we automatically do it from 9ca4839aAaron Patterson2014-05-273-9/+0
| | |
| * | move path_parameter encoding check to the request objectAaron Patterson2014-05-273-18/+13
| | |
| * | dispatcher doesn't need `call` anymoreAaron Patterson2014-05-271-4/+0
| | |
| * | call `serve` with the request on dispatchersAaron Patterson2014-05-271-9/+10
| | |
| * | constraints class does not need the request class anymoreAaron Patterson2014-05-271-4/+4
| | |
| * | give all endpoints a superclassAaron Patterson2014-05-274-22/+40
| | |
| * | skip the build business if the stack is emptyAaron Patterson2014-05-261-2/+6
| | |
| * | stop hardcoding path_parameters and get it from the requestAaron Patterson2014-05-261-1/+2
| | |
| * | we do not need to cache rack_appAaron Patterson2014-05-261-9/+3
| | |
| * | a redirect is not a dispatcher by definition, so eliminate testAaron Patterson2014-05-261-1/+1
| | |
| * | push is_a check up to where the Constraints object is allocatedAaron Patterson2014-05-262-6/+11
| | |
| * | pass the request object to the applicationAaron Patterson2014-05-253-6/+8
| | |
| * | pass a request to `matches?` so we can avoid creating excess requestsAaron Patterson2014-05-252-7/+6
| | |
| * | nothing is passed to `rack_app` anymore, so rm the paramsAaron Patterson2014-05-251-1/+1
| | |
| * | one fewer is_a checkAaron Patterson2014-05-251-4/+3
| | |
| * | Constraints#app should never return another Constraints object, so switch to ↵Aaron Patterson2014-05-251-1/+1
| | | | | | | | | | | | if statement
| * | eliminate dispatcher is_a checksAaron Patterson2014-05-241-8/+14
| | |
| * | push is_a?(Dispatcher) check in to one placeAaron Patterson2014-05-244-14/+12
| | |
| * | Always construct route objects with Constraint objectsAaron Patterson2014-05-244-9/+10
| | |
* | | Merge pull request #15321 from ↵Santiago Pastorino2014-05-271-1/+4
|\ \ \ | | | | | | | | | | | | | | | | tgxworld/only_find_routes_as_heads_for_head_request Call get_routes_as_head only on HEAD requests.
| * | | Call get_routes_as_head only on HEAD requests.Guo Xiang Tan2014-05-251-1/+4
| | | |
* | | | Skip individual tests upon Dalli::RingErrorMatthew Draper2014-05-271-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike the outer `rescue`, this one is much more precise about what we want to handle: a connection failure (`Dalli::RingError`) is not relevant to what we're testing here. But other Dalli errors may well be indicating an actual problem.
* | | | Escape user input before showing in the page.Rafael Mendonça França2014-05-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This is not a security issue since this page is not present in production and user have to type something in the field but is better to escape the input.
* | | | Merge pull request #15325 from tgxworld/no_need_to_call_to_sYves Senn2014-05-262-2/+2
|\ \ \ \ | | | | | | | | | | Remove duplicated to_s method call.
| * | | | Remove duplicated to_s method call.Guo Xiang Tan2014-05-252-2/+2
| |/ / /
* | | | Fix docs for ActionController::Renderers.addGuillermo Iguaran2014-05-261-1/+1
| | | |
* | | | Merge pull request #15310 from tgxworld/small_refactor_get_routes_as_headCarlos Antonio da Silva2014-05-251-3/+1
|\ \ \ \ | |/ / / |/| | | Remove unnecessary flatten! method call.
| * | | Remove unnecessary flatten! method call.Guo Xiang Tan2014-05-251-3/+1
| | | |
* | | | The correct status to test should be :switching_protocols.Zuhao Wan2014-05-251-2/+2
|/ / /
* | | Merge pull request #15305 from tgxworld/remove_unnecessary_requireGuillermo Iguaran2014-05-241-1/+0
|\ \ \ | |/ / |/| | Remove unnecessary require of Minitest.
| * | Remove unnecessary require of Minitest.Guo Xiang Tan2014-05-241-1/+0
| | | | | | | | | | | | Minitest has already been required when calling Minitest.autorun.
* | | unwrap the constraints object on initialization, eliminate loopsAaron Patterson2014-05-244-3/+12
| | | | | | | | | | | | | | | | | | | | | Unwrap Constraints objects. I don't actually think it's possible to pass a Constraints object to this constructor, but there were multiple places that kept testing children of this object. I *think* they were just being defensive, but I have no idea.
* | | Merge pull request #14986 from dlangevin/trailing-slash-url-generationRafael Mendonça França2014-05-243-7/+37
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixes URL generation with trailing_slash: true Conflicts: actionpack/lib/action_dispatch/http/url.rb
| * | | Fixes URL generation with trailing_slash: trueDan Langevin2014-05-223-9/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | URL generation with trailing_slash: true was adding a trailing slash after .:format Routes.draw do resources :bars end bars_url(trailing_slash: true, format: 'json') # => /bars.json/ This commit removes that extra trailing slash
* | | | Merge pull request #15291 from francocatena/router-visualizer-fixRafael Mendonça França2014-05-231-2/+2
|\ \ \ \ | | | | | | | | | | Fix router visualizer CSS and JS resources
| * | | | Fix router visualizer CSS and JS resourcesFranco Catena2014-05-231-2/+2
| | | | |
* | | | | Constraints contructor should always return a Constraints objectAaron Patterson2014-05-231-9/+5
| | | | | | | | | | | | | | | | | | | | I know, it's crazy.
* | | | | default value is never used, so make it requiredAaron Patterson2014-05-231-1/+1
| | | | |
* | | | | push options decomposition up so we can extractAaron Patterson2014-05-231-20/+13
|/ / / /
* | | | Merge pull request #15289 from zzak/future_port_c8ddb61Godfrey Chan2014-05-231-3/+3
|\ \ \ \ | | | | | | | | | | Future port c8ddb61 [ci skip]
| * | | | Future port c8ddb61Zachary Scott2014-05-231-3/+3
| | | | |