aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #11000 from sbeckeriv/accept_headerCarlos Antonio da Silva2013-06-251-1/+1
|\ | | | | | | Fix undefined method `ref' for nil:NilClass for bad accept headers
| * Fix undefined method `ref' for nil:NilClass for bad accept headersStephen Becker IV2013-06-191-1/+1
| |
* | Fix shorthand routes where controller and action are in the scopeAndrew White2013-06-251-2/+10
| | | | | | | | | | | | | | | | | | Merge `:action` from routing scope and assign endpoint if both `:controller` and `:action` are present. The endpoint assignment only occurs if there is no `:to` present in the options hash so should only affect routes using the shorthand syntax (i.e. endpoint is inferred from the the path). Fixes #9856
* | Merge pull request #11069 from ykzts/actiondispatch-ssl-secure-flag-igonore-caseGuillermo Iguaran2013-06-241-1/+1
|\ \ | | | | | | Flag cookies as secure with ignore case in ActionDispatch::SSL
| * | Flag cookies as secure with ignore case in ActionDispatch::SSLYamagishi Kazutoshi2013-06-241-1/+1
| | |
* | | ActionDispatch:SSL: don't include STS header in non-https responsesGeoff Buesing2013-06-231-2/+1
|/ /
* | Don't remove trailing slash from PATH_INFO for mounted appsPiotr Sarnacki2013-06-211-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously when app was mounted as following: class Foo def call(env) [200, {}, [env['PATH_INFO']]] end end RackMountRailsBug::Application.routes.draw do mount RackTest.new => "/foo" end trailing slash was removed from PATH_INFO. For example requesting GET /foo/bar/ on routes defined above would result in a response containing "/foo/bar" instead of "/foo/bar/". This commit fixes the issue. (closes #3215)
* | Move actionpack/lib/action_view* into actionview/libPiotr Sarnacki2013-06-2096-14646/+0
| |
* | Fix name of nested attributes option include_idEric Hankins2013-06-191-2/+2
| | | | | | The option to disable including a hidden ID field on a `fields_for` nested association was incorrectly documented as `hidden_field_id` instead of `include_id`
* | Remove duplicate letter 'a'. [ci skip]Uģis Ozols2013-06-191-1/+1
| |
* | Add `respond_with` `location` option to the docsTute Costa2013-06-181-2/+6
| |
* | Escape the string even when the condition of link_to_unless is not satisfied.dtaniwaki2013-06-161-1/+1
| |
* | Use a case insensitive URI Regexp for #asset_pathDavid Celis2013-06-161-1/+1
|/ | | | | | | | | | | | | Context: https://gist.github.com/radar/5793814 The `URI_REGEXP` that various AssetUrl helpers use is currently case sensitive when checking for a URI scheme. This means if you try to pass a URL like `HTTP://www.example.com/path/to/image.jpg`, you end up with a bogus asset path: `/assets/HTTP://www.example.com/path/to/image.jpg`. URLs are case insensitive, so this regexp should be as well. Signed-off-by: David Celis <me@davidcel.is>
* collection tags accept html attributes as the last element of collectionVasiliy Ermolovich2013-06-161-1/+2
|
* Update the HTML boolean attributes per the HTML 5.1 specAlex Peattie2013-06-141-2/+5
| | | | | | | - Add attributes `allowfullscreen`, `default`, `inert`, `sortable`, `truespeed`, `typemustmatch`. - Fix attribute `seamless` (previously misspelled `seemless`). - Use `assert_dom_equal` instead of `assert_equal` in test.
* Don't set X-UA-Compatible header by defaultGuillermo Iguaran2013-06-131-2/+1
| | | | | | We are setting this header to chrome=1 for Chrome Frame and this will be retired soon. Check http://blog.chromium.org/2013/06/retiring-chrome-frame.html for details
* Grammar nazi at work [ci skip]Paweł Gościcki2013-06-121-1/+1
|
* fixed typo in action_view templatediatmpravin2013-06-081-1/+1
|
* Merge pull request #10841 from latortuga/fix-underscore-dependency-trackingDavid Heinemeier Hansson2013-06-041-1/+1
|\ | | | | Fix mismatching variable names when using an underscore
| * Fix mismatching variable names when using an underscoreDrew Ulmer2013-06-041-1/+1
| | | | | | | | | | | | | | | | The ERBTracker template digest helper class was using a regex to match render calls and it was incorrectly not matching against variables with underscores in the name. This caused it to use the wrong regex match data to populate the template dependency. Because underscore is a valid character for a variable, this fixes the ERBTracker to match it properly.
* | Merge pull request #10839 from gsamokovarov/clean-normalize_encoded_pathsRafael Mendonça França2013-06-041-11/+7
|\ \ | | | | | | Refactor ActionDispatch::Http::Parameters#normalize_encode_params
| * | Refactor ActionDispatch::Http::Parameters#normalize_encode_paramsGenadi Samokovarov2013-06-041-11/+7
| | |
* | | Merge pull request #10838 from gsamokovarov/routing-autoload_underRafael Mendonça França2013-06-041-5/+7
|\ \ \ | |_|/ |/| | DRY-up ActionDispatch::Routing autoloads
| * | Dry-up ActionDispatch::Routing autoloadsGenadi Samokovarov2013-06-041-5/+7
| |/
* | Raise ArgumentError to fix Rails 4.1 deprecation warn message.kennyj2013-06-021-5/+1
| |
* | Remove Mime::Type#verify_request? and Mime::Type.browser_generated_types ↵kennyj2013-06-021-16/+0
| | | | | | | | were deprecated.
* | Remove ActionView::Template#mime_type was deprecated.kennyj2013-06-011-6/+0
| |
* | Remove ActionController::RecordIdentifier was deprecated.kennyj2013-06-013-36/+0
| |
* | Remove action_controller/vendor/html-scanner.rb was deprecated.kennyj2013-06-011-5/+0
| |
* | Remove :confirm and :disable_with options from ↵kennyj2013-06-011-41/+0
| | | | | | | | ActionView::Helpers::FormTagHelper were deprecated.
* | Remove link_to_function / button_to_function from ↵kennyj2013-06-011-42/+0
| | | | | | | | ActionView::Helpers::JavascriptHelper were deprecated.
* | Remove :confirm and :disable_with options for ↵kennyj2013-06-011-18/+0
| | | | | | | | ActionView::Helpers::UrlHelper#link_to and #button_to were deprecated.
* | Add propery docs to ActionDispatch::Response [ci skip]Steve Klabnik2013-05-301-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | After some discussion on Twitter with @skud, the documentation on ActionDispatch::Response is a bit sparse. This class is useful when you're writing tests, as often you want to assert various things about the response that's coming back. Better docs would make this easier for people new to testing in Rails. I only added some descriptions for various properties that were defined, and mostly just a sentence or two. Most of these things are familliar if you're working with HTTP, but some words is better than no words at all. Hopefully further commits will fix up things that aren't just documentation.
* | Merge pull request #10803 from gsamokovarov/extract-deep-mungeRafael Mendonça França2013-05-303-18/+27
|\ \ | | | | | | Extract ActionDispatch::Request#deep_munge
| * | Extract ActionDispatch::Request#deep_mungeGenadi Samokovarov2013-05-303-18/+27
| |/ | | | | | | | | | | | | | | | | ActionDispatch::Request#deep_munge was introduced as a private method, but was turned into a public one for the use of ActionDispatch::ParamsParser. I have extracted it into ActionDispatch::Request::Utils, so it does not get mixed up with the Request public methods.
* / `RoutesInspector` deals with routes using regexp as `:controller` optionYves Senn2013-05-301-1/+1
|/
* Require only minitest.Rafael Mendonça França2013-05-221-1/+1
| | | | | minitest/autorun required minitest/spec and we are avoiding to require it.
* Merge pull request #10667 from rubys/minitest-autorunRafael Mendonça França2013-05-221-1/+1
|\ | | | | Eliminate minitest warnings
| * Eliminate minitest warningsSam Ruby2013-05-171-1/+1
| | | | | | | | https://github.com/seattlerb/minitest/commit/9a57c520ceac76abfe6105866f8548a94eb357b6#L15R8
* | Add has_named_route? to the mapper APIJosé Valim2013-05-201-0/+5
|/
* Fix named routing regression from 3.2.13schneems2013-05-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | When named route that is nested is used in 3.2.13 Example `routes.rb`: ``` resources :nested do resources :builder, :controller => 'nested/builder' end ``` In 3.2.12 and 3.2.12 this named route would work: ``` nested_builder_path(:last_step, :nested_id => "foo") ``` Generating a url that looks like `/nested/foo/builder/last_step`. This PR fixes the regression when building urls via the optimized helper. Any explicit keys set in the options are removed from the list of implicitly mapped keys. Not sure if this is exactly how the original version worked, but this fixes this use case regression.
* Merge pull request #10527 from zenspider/squishy_minitest5Aaron Patterson2013-05-161-1/+3
|\ | | | | Squishy minitest5
| * Updates to make rails 4 happy with minitest 5:Ryan Davis2013-05-061-1/+3
| | | | | | | | | | | | | | | | | | | | + Namespace changes, overhaul of runners. + Internal ivar name changes - Removed a logger globally applied to tests that spew everywhere?!? + Override Minitest#__run to sort tests by name. + Reworked testing isolation to work with the new cleaner architecture. - Removed a bunch of tests that just test minitest straight up. I think these changes were all merged to minitest 4 a long time ago. - Minor report output differences.
* | Revert "Integration tests support the OPTIONS http method"Rafael Mendonça França2013-05-161-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ad46884af567d6f8d6d8d777f372c39e81a560ba. Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_dispatch/testing/integration.rb actionpack/test/controller/integration_test.rb Reason: It will conflict with a lot of test cases. Better to call `process` directly since this is a very uncommon HTTP method. Fixes #10638.
* | Merge pull request #10636 from seanwalbran/fix-asset-host-proc-returning-nilRafael Mendonça França2013-05-161-1/+2
|\ \ | | | | | | fix rails4 regression with asset_host Proc returning nil
| * | restore ability to return nil from asset_host proc, add testSean Walbran2013-05-151-1/+2
| | |
* | | Revert "Add the options method to action_controller testcase."Rafael Mendonça França2013-05-161-6/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0303c2325fab253adf5e4a0b738cb469c048f008. Conflicts: actionpack/lib/action_controller/test_case.rb REASON: It will conflict with a lot of test cases. Better to call `process` directly since this is a very uncommon HTTP method. Fixes #10638.
* | deprecating string based terminatorsAaron Patterson2013-05-141-1/+3
| |
* | inspect the filter when displaying error messagesAaron Patterson2013-05-141-1/+1
| |
* | Fixing build broken by this changeArun Agrawal2013-05-131-2/+2
| | | | | | | | c43ca06ca091fc09e2c86bb051ac92b648f12b64