aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-04-181-2/+2
|\
| * re-phrase how to run a testWaynn Lue2014-04-151-2/+2
| |
* | Remove wrapper div for inputs in button_toRafael Mendonça França2014-04-171-1/+1
| | | | | | | | Related with cbb917455f306cf5818644b162f22be09f77d4b2
* | Update Request forgery tests to remove input wrappign divRafael Mendonça França2014-04-171-5/+5
| | | | | | | | This was changed at cbb917455f306cf5818644b162f22be09f77d4b2
* | Add CHANGELOG entry for #14755 [ci skip]Rafael Mendonça França2014-04-171-0/+5
| |
* | Change the method descriptionRafael Mendonça França2014-04-171-1/+1
| |
* | Implement to_io as an aliasRafael Mendonça França2014-04-171-5/+1
| |
* | Merge pull request #14755 from timlinquist/to_io_http_uploadRafael Mendonça França2014-04-172-0/+11
|\ \ | | | | | | | | | Use common to_io so users can access the underlying IO object
| * | Provide interface for accessing underlying IO objectTim Linquist2014-04-152-0/+11
| | | | | | | | | | | | | | | | | | In some cases users may need to work with/manipulate more of the Tempfile api than provided by Upload. Allow users to get at the underlying io via the common to_io method of IO/IO-like objects
* | | Update AC::Metal documentation example [ci skip]Yury Velikanau2014-04-151-1/+2
| | | | | | | | | | | | Include proper module since AV was extracted form AP as mentioned in #14659.
* | | Merge pull request #14745 from razum2um/plain-text-diagnosticsRafael Mendonça França2014-04-153-1/+11
|\ \ \ | | | | | | | | Display diagnostics in text format for xhr request
| * | | Display diagnostics in text format for xhr requestVlad Bokov2014-04-143-1/+11
| | | |
* | | | Merge pull request #14728 from stomar/assertion-msgYves Senn2014-04-152-14/+16
|\ \ \ \ | | | | | | | | | | Remove surplus period from assertion messages
| * | | | Refine tests for assert_select failure messagesMarcus Stollsteimer2014-04-141-11/+13
| | | | |
| * | | | Remove surplus period from assertion messagesMarcus Stollsteimer2014-04-131-3/+3
| | | | |
* | | | | Merge pull request #14642 from tgxworld/fix_notifications_not_unsubscribingYves Senn2014-04-151-5/+7
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix subscriptions not being unsubscribed.
| * | | | Fix subscriptions not being unsubscribed.Guo Xiang Tan2014-04-141-5/+7
| |/ / /
* | / / Return null type format when format is not knowRafael Mendonça França2014-04-143-1/+13
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When requesting a controller with the following code with a unknown format: def my_action respond_to do |format| format.json { head :ok } format.any { render text: 'Default response' } end end we should render the default response instead of raising ActionController::UnknownFormat Fixes #14462 Conflicts: actionpack/CHANGELOG.md actionpack/test/controller/mime/respond_with_test.rb Conflicts: actionpack/CHANGELOG.md
* | | Update documentation to use Rails.application insteadMarcel Morgan2014-04-132-2/+2
|/ / | | | | | | | | | | | | References to ``AppName::Application` removed in favour of ``Rails.application`` as generated with a new rails 4.1 app. [ci skip]
* | Add CHANGELOG entry for #14619 [ci skip]Rafael Mendonça França2014-04-111-0/+4
| |
* | Merge pull request #14619 from winston/enhance-routing-error-htmlRafael Mendonça França2014-04-111-63/+119
|\ \ | | | | | | | | | Enhance routing error html page
| * | Split search results into 'exact matches' and 'fuzzy matches'.Winston2014-04-111-60/+96
| | | | | | | | | | | | - also refactored the javascript.
| * | Improve CSS styling for routing error html page.Winston2014-04-111-7/+25
| | |
| * | Implement fuzzy matching for route search on routing error html page.Winston2014-04-111-8/+10
| | |
* | | Only make deeply nested routes shallow when parent is shallowAndrew White2014-04-112-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since `:shallow` may be set at any point in the resource nesting we should only make the new and collection routes shallow when the parent is shallow. This is a bit of a hack but until the mapper is refactored to an object graph instead of a hash of merged values it's the best we can do. Fixes #14684.
* | | Add a failing test for a URL helper that was broken by a6b9ea2.James Coglan2014-04-101-0/+18
|/ /
* | Avoid URI parsingAndriel Nuernberg2014-04-092-5/+15
| | | | | | | | | | This parsing is unecessary once the Request object already has the needed information.
* | Remove unused `subclass_controller_with_flash_type_bar` var from flash test.Vipul A M2014-04-071-2/+2
| |
* | Fix setup of adding _flash_types test.Guo Xiang Tan2014-04-061-6/+15
| | | | | | | | | | | | | | Adding flash types to a controller within any of the tests will result in a global state change of the controller under test. This patch will prevent state leaks and allow us to run the test in random order.
* | push move_string in to `move`Aaron Patterson2014-04-011-14/+12
| |
* | combine move_regexp and move_string so we only loop over states onceAaron Patterson2014-04-011-9/+6
| |
* | do not create memo objects since we'll just throw them awayAaron Patterson2014-04-012-9/+11
| |
* | only ask if `t` is empty once.Aaron Patterson2014-04-011-4/+1
| |
* | Tiny doc fix for Strong ParametersIan C. Anderson2014-03-301-1/+1
| | | | | | - accepts_nested_attribute_for -> accepts_nested_attributes_for
* | Merge pull request #13890 from achempion/syntax-error-backtraceYves Senn2014-03-293-0/+47
|\ \ | |/ |/| append link to bad code when error type is SyntaxError
| * Append link to bad code to backtrace when exception is SyntaxErrorBoris Kuznetsov2014-03-273-0/+47
| |
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-03-291-0/+4
|\ \
| * | Mention required glob param name in match docs for mapperEarl St Sauver2014-03-201-0/+4
| | | | | | | | | | | | | | | | | | | | | THe match documentation doesn't mention any requirement of the parameter name requirement for matches. However, including a bare glob character without a variable assignment causes a parse error.
* | | Replace trivial regexp with string or index, twice as fastKelley Reynolds2014-03-282-2/+2
| |/ |/|
* | update comments to reflect that options support is not availableFrederick Cheung2014-03-251-2/+2
| |
* | Swapped parameters of assert_equal in assert_selectVishal Lal2014-03-222-1/+8
| |
* | Update test helper to use latest Digestor APIDavid Heinemeier Hansson2014-03-211-8/+8
| |
* | The digest option is no longer honoured since Rails 3.0 [ci skip]Godfrey Chan2014-03-201-1/+1
| | | | | | | | Closes #8513
* | Cleaning and adding tests for SessionAttila Domokos2014-03-191-7/+34
| | | | | | Adding tests for Session `destroy`, `update` and `delete` methods. No changes for code under test.
* | Merge pull request #14090 from ↵Aaron Patterson2014-03-172-10/+30
|\ \ | | | | | | | | | | | | Fortisque/kevin/stream_error_in_main_thread_if_not_committed re-raise error if error occurs before committing in streaming
| * | re-raise error if error occurs before committing in streamingKevin Casey2014-03-142-10/+30
| | | | | | | | | | | | update the tests, using an if-else
* | | Add an explicit require for 4ece124396669d3580e7f229ab407a0d4882727a rather ↵Jeremy Kemper2014-03-161-0/+1
| | | | | | | | | | | | than assume SecureRandom is available
* | | Avoid concurrent test collision on the same memcache server by namespacing keysJeremy Kemper2014-03-161-1/+1
| | |
* | | Use nested_scope? not shallow? to determine whether to copy optionsAndrew White2014-03-163-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | The method `shallow?` returns false if the parent resource is a singleton so we need to check if we're not inside a nested scope before copying the :path and :as options to their shallow equivalents. Fixes #14388.
* | | Merge pull request #14329 from pch/digestor-lookup-fixRafael Mendonça França2014-03-142-0/+24
|\ \ \ | |/ / |/| | | | | Ensure LookupContext in Digestor selects correct variant