aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Fixed typo new_defautls -> new_defaults.Philip Arndt2012-05-232-5/+15
| |_|/ |/| | | | | | | | | | | * Added tests for 'else' case in ActionView::Helpers::TranslationHelper#wrap_translate_defaults * Also updated the testing syntax of translation.html_safe? asserts to provide better output upon failure.
* | | Merge pull request #6429 from marcandre/fix_test_requestCarlos Antonio da Silva2012-05-212-1/+8
|\ \ \ | | | | | | | | Fix bug when Rails.application is defined but is nil. See #881
| * | | Fix bug when Rails.application is defined but is nil. See #881Marc-Andre Lafortune2012-05-212-1/+8
| | | |
* | | | Add instance_accessor option to class_attributeAlexey Vakhov2012-05-221-2/+1
|/ / /
* | | Revert "Merge pull request #6425 from pinetops/resolver_concurrency_fix"José Valim2012-05-212-72/+23
| | | | | | | | | | | | | | | This reverts commit 254c04286c5916ae7f91eb6e173b312e7a74e364, reversing changes made to 513a0525c24c2944630acfa465b22cd2f4601adf.
* | | Merge pull request #6425 from pinetops/resolver_concurrency_fixAaron Patterson2012-05-212-23/+72
|\ \ \ | |/ / |/| | Resolver concurrency fix
| * | More granular locking of the Resolver template cacheTom Clarke2012-05-211-5/+23
| | | | | | | | | | | | | | | | | | | | | In order to avoid holding a global lock when doing template resolution, instead add individual locks on a per cache entry basis. The global lock is now only used for manipulation of the main cache data structure.
| * | Make the Resolver template cache threadsafe - closes #6404Tom Clarke2012-05-212-23/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | The Template cache in the Resolver can be accessed by multiple threads similtaneously in multi-threaded environments. The cache is implemented using a Hash, which isn't threadsafe in all VMs (notably JRuby). This commit extracts the cache to a new Cache class and adds mutexes to prevent concurrent access.
* | | Merge pull request #2549 from trek/RoutingErrorForMissingControllersAaron Patterson2012-05-212-3/+17
|\ \ \ | | | | | | | | When a route references a missing controller, raise ActionController::RoutingError with clearer message
| * | | When a route references a missing controller, raise ↵Trek Glowacki2011-08-162-3/+17
| | | | | | | | | | | | | | | | ActionController::RoutingError with a clearer message
* | | | Refactoring: turn unless/else into if/elseAndrey Vakarev2012-05-211-9/+9
| | | |
* | | | Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806f7b028614cJosé Valim2012-05-201-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Template concurrency fixes Conflicts: actionpack/lib/action_view/template.rb
* | | | Fix CHANGELOG order and add a brief description of the changes in theRafael Mendonça França2012-05-201-3/+3
| | | | | | | | | | | | | | | | Action Pack in the upgrading guide. [ci skip]
* | | | Escape the extension when normalizing the action cache path.Andrew White2012-05-202-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although no recognized formats use non-ASCII characters, sometimes they can be included in the :format parameter because of invalid URLS. To prevent encoding incompatibility errors we need to escape them before passing the path to URI.unescape. Closes #4379
* | | | Return 400 Bad Request for URL paths with invalid encoding.Andrew White2012-05-204-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing path parameters with invalid encoding is likely to trigger errors further on like `ArgumentError (invalid byte sequence in UTF-8)`. This will result in a 500 error whereas the better error to return is a 400 error which allows exception notification libraries to filter it out if they wish. Closes #4450
* | | | Raise ActionController::BadRequest for malformed parameter hashes.Andrew White2012-05-208-6/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently Rack raises a TypeError when it encounters a malformed or ambiguous hash like `foo[]=bar&foo[4]=bar`. Rather than pass this through to the application this commit captures the exception and re-raises it using a new ActionController::BadRequest exception. The new ActionController::BadRequest exception returns a 400 error instead of the 500 error that would've been returned by the original TypeError. This allows exception notification libraries to ignore these errors if so desired. Closes #3051
* | | | Correct order of expected and actual argumentsAndrew White2012-05-201-1/+1
| | | |
* | | | fix closing tag [ci skip]Vijay Dev2012-05-201-1/+1
| | | |
* | | | Raise Assertion instead of RoutingError for routing assertion failures.David Chelimsky2012-05-204-18/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change, assert_recognizes, assert_generates, and assert_routing raised ActionController::RoutingError when they failed to recognize the route. This commit changes them to raise Assertion instead. This aligns with convention for logical failures, and supports reporting tools that care about the difference between logical failures and errors e.g. the summary at the end of a test run. - Fixes #5899
* | | | Show in log correct wrapped keysDmitry Vorotilin2012-05-202-1/+10
| | | |
* | | | Merge pull request #5631 from avakhov/ac-log-subsriber-small-refacPiotr Sarnacki2012-05-191-3/+1
|\ \ \ \ | | | | | | | | | | Make AC::LogSubscriber#send_file like #send_data
| * | | | Make AC::LogSubscriber#send_file like #send_dataAlexey Vakhov2012-05-191-3/+1
| | | | |
* | | | | Don't use assert_block method. It will be deprecated.kennyj2012-05-201-1/+1
| |_|_|/ |/| | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-191-1/+4
|\ \ \ \
| * | | | minor fix wrapper tag documentationFrancesco Rodriguez2012-05-181-1/+1
| | | | |
| * | | | Minor fix to the wrapper tag documentation, the options hash is the last ↵Avi Tzurel2012-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | one, added blank hash before that in the args list
| * | | | Added wrapper tag documentation to the simple_format methodAvi Tzurel2012-05-191-1/+4
| | | | |
* | | | | Clarify grouped_options_for_select method API, add changelog entryCarlos Antonio da Silva2012-05-193-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the method API more clear by explicitly showing the expected arguments. This means that the options cannot be passed as second argument because we are not relying on extract_options! anymore, you are expected to give a selected key or `nil` if you want to pass options, as it is the last argument. Notice that this does not change the current method arguments contract available in 3.2, it just brings back the same functionality with the divider addition.
* | | | | Improve `rake routes` output for redirects - closes #6369.Andrew White2012-05-191-12/+22
| |/ / / |/| | |
* | | | Merge pull request #6384 from ihid/tidy_text_helpersJeremy Kemper2012-05-182-14/+62
|\ \ \ \ | | | | | | | | | | Tidied and standardised text_helper implementations.
| * | | | Tidied and standardised text_helper implementations.Jeremy Walker2012-05-192-14/+62
| | | | |
* | | | | Fix inspecting route redirections, closes #6369Łukasz Strzałkowski2012-05-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes route inspection in `rake routes` Before: foo /foo(.:format) :controller#:action" After: foo /foo(.:format) Redirect (301)
* | | | | Fix build: can't convert Regexp to Stringkennyj2012-05-191-1/+1
| | | | |
* | | | | reverting decoupling of NumberHelper from safe_join and adding tests for ↵Andrew Mutz2012-05-182-1/+3
|/ / / / | | | | | | | | | | | | escaping of delimiters and separators
* | | | Merge pull request #6372 from richo/bugs/middleware_stack_as_arrayJosé Valim2012-05-172-2/+12
|\ \ \ \ | | | | | | | | | | Add some common Array methods to the middleware stack
| * | | | Add the #unshift method to the middleware stackRich Healey2012-05-182-2/+12
| | |_|/ | |/| | | | | | | | | | | | | | | | | | The docs suggest that the middleware stack is an Array, so I've added the unshift method to it. Originally I added some more Array methods, but it was agreed that they lacked usecases.
* | | | Merge pull request #5020 from KL-7/fix-blank-image_tag-sourceJosé Valim2012-05-172-2/+3
|\ \ \ \ | | | | | | | | | | Render img tag with empty src if empty string is passed to image_tag.
| * | | | Render img tag with empty src if empty string is passed to image_tag.Kirill Lashuk2012-05-182-2/+3
| |/ / /
* / / / Add HTML5 input[type="time"] helperAlex Soulim2012-05-187-0/+76
|/ / /
* | | Removed old text_helper apis for highlight, excerpt and word_wrapJeremy Walker2012-05-173-69/+27
| | |
* | | Fix incorrect assert_block -> assert conversion. Assumed too much from the ↵Jeremy Kemper2012-05-171-2/+2
| | | | | | | | | | | | MiniTest deprecation message.
* | | Merge pull request #2036 from Bodacious/tag_helper_data_fixRafael Mendonça França2012-05-172-4/+5
|\ \ \ | | | | | | | | TagHelper creates invalid data attributes when value is a BigDecimal
| * | | Fixed tag_helper data-attribute bug with BigDecimalsBodacious2012-05-172-4/+5
| |/ /
* | | MiniTest deprecated #assert_block in favor of calling #assert with a blockJeremy Kemper2012-05-171-1/+1
| | |
* | | Update actionpack/CHANGELOG.mdJosé Valim2012-05-171-0/+3
| | |
* | | Merge pull request #6309 from steveklabnik/fix-2394José Valim2012-05-179-6/+36
|\ \ \ | |/ / |/| | Created a Raw handler for templates.
| * | Created a Raw handler for templates.Steve Klabnik2012-05-179-6/+36
| | | | | | | | | | | | Fixes #2394
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-172-5/+7
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/core.rb
| * | | fix word_wrap eg output [ci skip]Vijay Dev2012-05-171-1/+3
| | | |
| * | | Fix code example for word_wrap helper.Hendy Tanata2012-05-171-2/+2
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 21:57:23 +0000