Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Raise Assertion instead of RoutingError for routing assertion failures. | David Chelimsky | 2012-05-20 | 2 | -11/+11 |
| | | | | | | | | | | | | | 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 | 1 | -0/+8 |
| | |||||
* | Don't use assert_block method. It will be deprecated. | kennyj | 2012-05-20 | 1 | -1/+1 |
| | |||||
* | Clarify grouped_options_for_select method API, add changelog entry | Carlos Antonio da Silva | 2012-05-19 | 1 | -2/+2 |
| | | | | | | | | | | | | 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. | ||||
* | Merge pull request #6384 from ihid/tidy_text_helpers | Jeremy Kemper | 2012-05-18 | 1 | -0/+42 |
|\ | | | | | Tidied and standardised text_helper implementations. | ||||
| * | Tidied and standardised text_helper implementations. | Jeremy Walker | 2012-05-19 | 1 | -0/+42 |
| | | |||||
* | | 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 | 1 | -0/+2 |
|/ | | | | escaping of delimiters and separators | ||||
* | Merge pull request #6372 from richo/bugs/middleware_stack_as_array | José Valim | 2012-05-17 | 1 | -2/+7 |
|\ | | | | | Add some common Array methods to the middleware stack | ||||
| * | Add the #unshift method to the middleware stack | Rich Healey | 2012-05-18 | 1 | -2/+7 |
| | | | | | | | | | | | | 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 | 1 | -0/+1 |
|\ \ | | | | | | | 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 | 1 | -0/+1 |
| |/ | |||||
* / | Add HTML5 input[type="time"] helper | Alex Soulim | 2012-05-18 | 2 | -0/+31 |
|/ | |||||
* | Removed old text_helper apis for highlight, excerpt and word_wrap | Jeremy Walker | 2012-05-17 | 1 | -34/+22 |
| | |||||
* | Merge pull request #2036 from Bodacious/tag_helper_data_fix | Rafael Mendonça França | 2012-05-17 | 1 | -2/+2 |
|\ | | | | | TagHelper creates invalid data attributes when value is a BigDecimal | ||||
| * | Fixed tag_helper data-attribute bug with BigDecimals | Bodacious | 2012-05-17 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #6309 from steveklabnik/fix-2394 | José Valim | 2012-05-17 | 6 | -5/+20 |
|\ \ | |/ |/| | Created a Raw handler for templates. | ||||
| * | Created a Raw handler for templates. | Steve Klabnik | 2012-05-17 | 6 | -5/+20 |
| | | | | | | | | Fixes #2394 | ||||
* | | Make :prompt work as documented | Rafael Mendonça França | 2012-05-16 | 1 | -0/+7 |
| | | |||||
* | | Test deprecation and fix the documentation of grouped_options_for_select | Rafael Mendonça França | 2012-05-16 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #5369 from ↵ | Aaron Patterson | 2012-05-16 | 1 | -2/+27 |
|\ \ | | | | | | | | | | | | | 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 | 1 | -2/+27 |
| | | | | | | | | | | | | 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 | 1 | -0/+8 |
|\ \ \ | |/ / |/| | | Feature/simple format refactoring | ||||
| * | | Added the wrapper tag option to simple_format | Avi Tzurel | 2012-05-14 | 1 | -0/+8 |
| |/ | |||||
* | | Revert "Revert "Remove `:disable_with` in favor of `'data-disable-with'` ↵ | José Valim | 2012-05-15 | 2 | -30/+2 |
| | | | | | | | | | | | | | | | | | | 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é Valim | 2012-05-15 | 2 | -2/+30 |
| | | | | | | | | | | | | | | | | | | | | `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. | ||||
* | | add tests and external file backtrace for Routing::Mapper#draw | Kornelius Kalnbach | 2012-05-15 | 3 | -0/+51 |
| | | |||||
* | | Remove `:disable_with` in favor of `'data-disable-with'` option from ↵ | Carlos Galdino + Rafael Mendonça França | 2012-05-14 | 2 | -30/+2 |
|/ | | | | `submit_tag`, `button_tag` and `button_to` helpers. | ||||
* | Remove `:mouseover` option from `image_tag` helper. | Rafael Mendonça França | 2012-05-13 | 1 | -8/+0 |
| | |||||
* | Merge pull request #3237 from sakuro/data-url-scheme | Rafael Mendonça França | 2012-05-13 | 1 | -1/+2 |
| | | | | | | | Support data: url scheme Conflicts: actionpack/lib/action_view/asset_paths.rb | ||||
* | Do not add `:include_blank` option if prompt is present | Rafael Mendonça França | 2012-05-13 | 1 | -0/+7 |
| | |||||
* | Only set `:include_blank` if the value of this options is not present | Rafael Mendonça França | 2012-05-13 | 1 | -0/+6 |
| | |||||
* | `:include_blank` should be true if the size option is nil | Rafael Mendonça França | 2012-05-13 | 1 | -14/+22 |
| | |||||
* | Merge pull request #6225 from ↵ | Rafael Mendonça França | 2012-05-13 | 1 | -0/+21 |
|\ | | | | | | | | | | | | | | | | | | | | | acapilleri/select_with_required_true_include_first_option_blank HTML5 validation error with options_from_collection_for_select Fixes #5908 Conflicts: actionpack/CHANGELOG.md | ||||
| * | Always include the options :include_blank if the select has a required attribute | angelo giovanni capilleri | 2012-05-13 | 1 | -0/+21 |
| | | | | | | | | and display size 1 and not multiple attribute, Fixes #5908 | ||||
* | | mispelling errors in render_text_test.rb and sqlite_specific_schema | angelo giovanni capilleri | 2012-05-12 | 1 | -2/+2 |
| | | |||||
* | | Remove useless load path modifications | Santiago Pastorino | 2012-05-11 | 2 | -9/+0 |
| | | |||||
* | | Copy literal route constraints to defaults - fixes #3571 and #6224. | Andrew White | 2012-05-11 | 2 | -3/+45 |
| | | |||||
* | | Don't ignore nil positional arguments for url helpers - fixes #6196. | Andrew White | 2012-05-10 | 1 | -0/+35 |
| | | |||||
* | | Refactor the handling of default_url_options in integration tests | Andrew White | 2012-05-10 | 1 | -0/+80 |
|/ | | | | | | | | | | | | This commit improves the handling of default_url_options in integration tests by making behave closer to how a real application operates. Specifically the following issues have been addressed: * Options specified in routes.rb are used (fixes #546) * Options specified in controllers are used * Request parameters are recalled correctly * Tests can override default_url_options directly | ||||
* | Refactor Generator class to not rely on in-place editing the controller | Andrew White | 2012-05-09 | 1 | -6/+6 |
| | |||||
* | Fix bug when url_for changes controller. | Nikita Beloglazov | 2012-05-09 | 1 | -0/+9 |
| | |||||
* | Add failing test re #3436 which demonstrates content_type is not respected ↵ | Kunal Shah | 2012-05-08 | 1 | -0/+21 |
| | | | | when using the :head method/shortcut | ||||
* | Add passing tests for generating URLs with nested SCRIPT_NAMEs | Jeremy Kemper | 2012-05-07 | 2 | -3/+17 |
| | |||||
* | Merge pull request #5368 from andhapp/remove-max-stale | José Valim | 2012-05-07 | 1 | -4/+4 |
|\ | | | | | Minor test improvement | ||||
| * | Removed max-stale from the tests since it's a request cache-control ↵ | Anuj Dutta | 2012-03-10 | 1 | -4/+4 |
| | | | | | | | | directive, just for clarity sake. | ||||
* | | Fix that optimized named routes should also work as singleton methods on the ↵ | Jeremy Kemper | 2012-05-06 | 1 | -0/+24 |
| | | | | | | | | url_helpers module | ||||
* | | added an integration test that checks ActionController::UnknownFormat ↵ | Steven Soroka | 2012-05-06 | 1 | -0/+9 |
| | | | | | | | | renders 406 :not_acceptable | ||||
* | | Raise a rescuable exception when Rails doesn't know what to do with the ↵ | Steven Soroka | 2012-05-06 | 1 | -13/+19 |
| | | | | | | | | format, rather than responding with a head :not_acceptable (406) | ||||
* | | check checkboxes with array of strings as :checked option | Vasiliy Ermolovich | 2012-05-05 | 1 | -0/+9 |
| | |