Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Escape the extension when normalizing the action cache path. | Andrew White | 2012-05-20 | 2 | -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 White | 2012-05-20 | 4 | -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 White | 2012-05-20 | 8 | -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 arguments | Andrew White | 2012-05-20 | 1 | -1/+1 |
| | |||||
* | fix closing tag [ci skip] | Vijay Dev | 2012-05-20 | 1 | -1/+1 |
| | |||||
* | Raise Assertion instead of RoutingError for routing assertion failures. | David Chelimsky | 2012-05-20 | 4 | -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 keys | Dmitry Vorotilin | 2012-05-20 | 2 | -1/+10 |
| | |||||
* | Merge pull request #5631 from avakhov/ac-log-subsriber-small-refac | Piotr Sarnacki | 2012-05-19 | 1 | -3/+1 |
|\ | | | | | Make AC::LogSubscriber#send_file like #send_data | ||||
| * | Make AC::LogSubscriber#send_file like #send_data | Alexey Vakhov | 2012-05-19 | 1 | -3/+1 |
| | | |||||
* | | Don't use assert_block method. It will be deprecated. | kennyj | 2012-05-20 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-19 | 1 | -1/+4 |
|\ \ | |||||
| * | | minor fix wrapper tag documentation | Francesco Rodriguez | 2012-05-18 | 1 | -1/+1 |
| | | | |||||
| * | | Minor fix to the wrapper tag documentation, the options hash is the last ↵ | Avi Tzurel | 2012-05-19 | 1 | -1/+1 |
| | | | | | | | | | | | | one, added blank hash before that in the args list | ||||
| * | | Added wrapper tag documentation to the simple_format method | Avi Tzurel | 2012-05-19 | 1 | -1/+4 |
| | | | |||||
* | | | Clarify grouped_options_for_select method API, add changelog entry | Carlos Antonio da Silva | 2012-05-19 | 3 | -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 White | 2012-05-19 | 1 | -12/+22 |
| |/ |/| | |||||
* | | Merge pull request #6384 from ihid/tidy_text_helpers | Jeremy Kemper | 2012-05-18 | 2 | -14/+62 |
|\ \ | | | | | | | Tidied and standardised text_helper implementations. | ||||
| * | | Tidied and standardised text_helper implementations. | Jeremy Walker | 2012-05-19 | 2 | -14/+62 |
| | | | |||||
* | | | Fix inspecting route redirections, closes #6369 | Łukasz Strzałkowski | 2012-05-18 | 1 | -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 String | kennyj | 2012-05-19 | 1 | -1/+1 |
| | | | |||||
* | | | reverting decoupling of NumberHelper from safe_join and adding tests for ↵ | Andrew Mutz | 2012-05-18 | 2 | -1/+3 |
|/ / | | | | | | | escaping of delimiters and separators | ||||
* | | Merge pull request #6372 from richo/bugs/middleware_stack_as_array | José Valim | 2012-05-17 | 2 | -2/+12 |
|\ \ | | | | | | | Add some common Array methods to the middleware stack | ||||
| * | | Add the #unshift method to the middleware stack | Rich Healey | 2012-05-18 | 2 | -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-source | José Valim | 2012-05-17 | 2 | -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 Lashuk | 2012-05-18 | 2 | -2/+3 |
| |/ / | |||||
* / / | Add HTML5 input[type="time"] helper | Alex Soulim | 2012-05-18 | 7 | -0/+76 |
|/ / | |||||
* | | Removed old text_helper apis for highlight, excerpt and word_wrap | Jeremy Walker | 2012-05-17 | 3 | -69/+27 |
| | | |||||
* | | Fix incorrect assert_block -> assert conversion. Assumed too much from the ↵ | Jeremy Kemper | 2012-05-17 | 1 | -2/+2 |
| | | | | | | | | MiniTest deprecation message. | ||||
* | | Merge pull request #2036 from Bodacious/tag_helper_data_fix | Rafael Mendonça França | 2012-05-17 | 2 | -4/+5 |
|\ \ | | | | | | | TagHelper creates invalid data attributes when value is a BigDecimal | ||||
| * | | Fixed tag_helper data-attribute bug with BigDecimals | Bodacious | 2012-05-17 | 2 | -4/+5 |
| |/ | |||||
* | | MiniTest deprecated #assert_block in favor of calling #assert with a block | Jeremy Kemper | 2012-05-17 | 1 | -1/+1 |
| | | |||||
* | | Update actionpack/CHANGELOG.md | José Valim | 2012-05-17 | 1 | -0/+3 |
| | | |||||
* | | Merge pull request #6309 from steveklabnik/fix-2394 | José Valim | 2012-05-17 | 9 | -6/+36 |
|\ \ | |/ |/| | Created a Raw handler for templates. | ||||
| * | Created a Raw handler for templates. | Steve Klabnik | 2012-05-17 | 9 | -6/+36 |
| | | | | | | | | Fixes #2394 | ||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-17 | 2 | -5/+7 |
|\ \ | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/core.rb | ||||
| * | | fix word_wrap eg output [ci skip] | Vijay Dev | 2012-05-17 | 1 | -1/+3 |
| | | | |||||
| * | | Fix code example for word_wrap helper. | Hendy Tanata | 2012-05-17 | 1 | -2/+2 |
| | | | |||||
| * | | Update action view context docs. | Oscar Del Ben | 2012-05-15 | 1 | -2/+2 |
| | | | |||||
* | | | Don't need to force size to nil | Rafael Mendonça França | 2012-05-16 | 4 | -10/+0 |
| | | | |||||
* | | | Document the usage of grouped_options_for_select with divider option | Rafael Mendonça França | 2012-05-16 | 1 | -1/+19 |
| | | | |||||
* | | | Make :prompt work as documented | Rafael Mendonça França | 2012-05-16 | 3 | -3/+16 |
| | | | |||||
* | | | Test deprecation and fix the documentation of grouped_options_for_select | Rafael Mendonça França | 2012-05-16 | 2 | -3/+6 |
| | | | |||||
* | | | Merge pull request #2237 from jackdempsey/log_redirect_to | Aaron Patterson | 2012-05-16 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | log at debug level what line caused the redirect_to | ||||
| * | | | log at debug level what line caused the redirect_to | Jack Dempsey | 2012-05-16 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #5369 from ↵ | Aaron Patterson | 2012-05-16 | 2 | -4/+44 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Greenie0506/add_separator_to_grouped_options_for_select Add separator option to grouped_options_for_select | ||||
| * | | | | Add separator argument to grouped_options_for_select | Greenie0506 | 2012-05-15 | 2 | -4/+44 |
| | | | | | | | | | | | | | | | | | | | | Change prompt to options hash in grouped_options_for_select | ||||
* | | | | | Merge pull request #6273 from KensoDev/feature/simple_format_refactoring | Rafael Mendonça França | 2012-05-15 | 2 | -9/+27 |
|\ \ \ \ \ | |/ / / / |/| | | | | Feature/simple format refactoring | ||||
| * | | | | Added the wrapper tag option to simple_format | Avi Tzurel | 2012-05-14 | 2 | -2/+12 |
| | | | | | |||||
| * | | | | simple_format refactoring | Avi Tzurel | 2012-05-14 | 1 | -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é Valim | 2012-05-15 | 5 | -55/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. |