aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806f7b028614cJosé Valim2012-05-201-10/+22
| | | | | | | Template concurrency fixes Conflicts: actionpack/lib/action_view/template.rb
* Escape the extension when normalizing the action cache path.Andrew White2012-05-201-2/+3
| | | | | | | | | 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-202-0/+18
| | | | | | | | | 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-203-5/+16
| | | | | | | | | | | | | | 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-201-7/+13
| | | | | | | | | | | | | 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-201-1/+2
|
* 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
| |
* | 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-191-14/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-181-14/+20
|\ \ | | | | | | Tidied and standardised text_helper implementations.
| * | Tidied and standardised text_helper implementations.Jeremy Walker2012-05-191-14/+20
| | |
* | | 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)
* | | reverting decoupling of NumberHelper from safe_join and adding tests for ↵Andrew Mutz2012-05-181-1/+1
|/ / | | | | | | escaping of delimiters and separators
* | Merge pull request #6372 from richo/bugs/middleware_stack_as_arrayJosé Valim2012-05-171-0/+5
|\ \ | | | | | | Add some common Array methods to the middleware stack
| * | Add the #unshift method to the middleware stackRich Healey2012-05-181-0/+5
| | | | | | | | | | | | | | | | | | 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-171-2/+2
|\ \ \ | | | | | | | | 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-181-2/+2
| |/ /
* / / Add HTML5 input[type="time"] helperAlex Soulim2012-05-184-0/+43
|/ /
* | Removed old text_helper apis for highlight, excerpt and word_wrapJeremy Walker2012-05-171-35/+3
| |
* | 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-171-2/+3
|\ \ | | | | | | TagHelper creates invalid data attributes when value is a BigDecimal
| * | Fixed tag_helper data-attribute bug with BigDecimalsBodacious2012-05-171-2/+3
| |/
* | MiniTest deprecated #assert_block in favor of calling #assert with a blockJeremy Kemper2012-05-171-1/+1
| |
* | Merge pull request #6309 from steveklabnik/fix-2394José Valim2012-05-173-1/+16
|\ \ | |/ |/| Created a Raw handler for templates.
| * Created a Raw handler for templates.Steve Klabnik2012-05-173-1/+16
| | | | | | | | 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
| | |
| * | Update action view context docs.Oscar Del Ben2012-05-151-2/+2
| | |
* | | Don't need to force size to nilRafael Mendonça França2012-05-164-10/+0
| | |
* | | Document the usage of grouped_options_for_select with divider optionRafael Mendonça França2012-05-161-1/+19
| | |
* | | Make :prompt work as documentedRafael Mendonça França2012-05-162-3/+9
| | |
* | | Test deprecation and fix the documentation of grouped_options_for_selectRafael Mendonça França2012-05-161-1/+4
| | |
* | | Merge pull request #2237 from jackdempsey/log_redirect_toAaron Patterson2012-05-161-0/+1
|\ \ \ | | | | | | | | log at debug level what line caused the redirect_to
| * | | log at debug level what line caused the redirect_toJack Dempsey2012-05-161-0/+1
| | | |
* | | | Merge pull request #5369 from ↵Aaron Patterson2012-05-161-2/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Greenie0506/add_separator_to_grouped_options_for_select Add separator option to grouped_options_for_select
| * | | | Add separator argument to grouped_options_for_selectGreenie05062012-05-151-2/+17
| | | | | | | | | | | | | | | | | | | | Change prompt to options hash in grouped_options_for_select
* | | | | Merge pull request #6273 from KensoDev/feature/simple_format_refactoringRafael Mendonça França2012-05-151-9/+19
|\ \ \ \ \ | |/ / / / |/| | | | Feature/simple format refactoring
| * | | | Added the wrapper tag option to simple_formatAvi Tzurel2012-05-141-2/+4
| | | | |
| * | | | simple_format refactoringAvi Tzurel2012-05-141-9/+17
| | |_|/ | |/| | | | | | | | | | | | | | using split_paragraphs method and content_tag instead of string concatination
* | | | Revert "Revert "Remove `:disable_with` in favor of `'data-disable-with'` ↵José Valim2012-05-152-25/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | option from `submit_tag`, `button_tag` and `button_to` helpers."" Finally remove `:disable_with` but use `:data => { :disable_with => ... }` in examples to show off a better API (which looks nicer in Ruby 1.9) This reverts commit a5c38a9c087e33d36397afc496be7c8e01b37ef0.
* | | | Revert "Remove `:disable_with` in favor of `'data-disable-with'` option from ↵José Valim2012-05-152-5/+25
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | `submit_tag`, `button_tag` and `button_to` helpers." `disable_with:` is much easier to type than `"data-disable-with" =>`, and the fact it uses "data-disable-with" => is an implementation concern, it should not affect the public API. This reverts commit 683fc4db00f496e5225928afb4d4e932e0fcdc48.
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-1532-152/+23
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-03 14:33:26 +0000