Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
* | | | Revert "Remove `:disable_with` in favor of `'data-disable-with'` option from ↵ | José Valim | 2012-05-15 | 5 | -11/+55 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `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/docrails | Vijay Dev | 2012-05-15 | 32 | -152/+23 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb | ||||
| * | | | Removing ==Examples and last blank lines of docs from actionpack | Francesco Rodriguez | 2012-05-15 | 32 | -183/+56 |
| | | | | |||||
| * | | | mispelling asset_tag_helper | Angelo Capilleri | 2012-05-13 | 1 | -1/+1 |
| | | | | |||||
* | | | | add tests and external file backtrace for Routing::Mapper#draw | Kornelius Kalnbach | 2012-05-15 | 4 | -3/+55 |
| | | | | |||||
* | | | | Use merge! instead reverse_merge! here | Santiago Pastorino | 2012-05-14 | 1 | -1/+1 |
| | | | | |||||
* | | | | Remove `:disable_with` in favor of `'data-disable-with'` option from ↵ | Carlos Galdino + Rafael Mendonça França | 2012-05-14 | 5 | -55/+11 |
| |/ / |/| | | | | | | | | `submit_tag`, `button_tag` and `button_to` helpers. | ||||
* | | | Remove `:mouseover` option from `image_tag` helper. | Rafael Mendonça França | 2012-05-13 | 3 | -21/+3 |
| | | | |||||
* | | | Merge pull request #3237 from sakuro/data-url-scheme | Rafael Mendonça França | 2012-05-13 | 3 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | Support data: url scheme Conflicts: actionpack/lib/action_view/asset_paths.rb | ||||
* | | | Remove dependency on safe_join from number helpers | Carlos Antonio da Silva | 2012-05-13 | 1 | -1/+1 |
| | | | | | | | | | | | | Introduced in 0f848dd54911f0e15c5c3aceabf09582cc6eab16. | ||||
* | | | Autoload ActionDispatch::Request::Session to avoid circular require. | Andrew White | 2012-05-13 | 1 | -1/+2 |
| | | | |||||
* | | | Merge pull request #6293 from carlosantoniodasilva/render-partial-refactor | José Valim | 2012-05-13 | 2 | -38/+37 |
|\ \ \ | | | | | | | | | Improve and cleanup a bit partial renderer | ||||
| * | | | Improve and cleanup a bit partial renderer | Carlos Antonio da Silva | 2012-05-12 | 2 | -38/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove template assignment: there is no need for this assignment, given we are rendering a collection with possibly different templates, and a second call to render (with the same instance) would behave differently if the template is set. * Remove segments array in favor of Array#map * Use local vars whenever possible * Cache local template keys, remove defaults from find_template | ||||
* | | | | Do not add `:include_blank` option if prompt is present | Rafael Mendonça França | 2012-05-13 | 2 | -3/+10 |
| | | | | |||||
* | | | | Only set `:include_blank` if the value of this options is not present | Rafael Mendonça França | 2012-05-13 | 2 | -1/+7 |
| | | | | |||||
* | | | | `:include_blank` should be true if the size option is nil | Rafael Mendonça França | 2012-05-13 | 3 | -17/+25 |
| | | | | |||||
* | | | | Merge pull request #6225 from ↵ | Rafael Mendonça França | 2012-05-13 | 3 | -0/+29 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acapilleri/select_with_required_true_include_first_option_blank HTML5 validation error with options_from_collection_for_select Fixes #5908 Conflicts: actionpack/CHANGELOG.md | ||||
| * | | | | Changed the changelog and documentation about | Angelo Capilleri | 2012-05-13 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | the select method (tag select) forces :include_blank if is required and no multiple and display size is one | ||||
| * | | | | Always include the options :include_blank if the select has a required attribute | angelo giovanni capilleri | 2012-05-13 | 2 | -0/+26 |
| | | | | | | | | | | | | | | | | | | | | and display size 1 and not multiple attribute, Fixes #5908 | ||||
* | | | | | Merge pull request #6171 from oscardelben/move_token_tag_if_block | Rafael Mendonça França | 2012-05-12 | 1 | -3/+3 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Switch token_tag if block | ||||
| * | | | | Switch token_tag if block | Oscar Del Ben | 2012-05-05 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | update example outputs of some asset helpers | Vijay Dev | 2012-05-12 | 1 | -18/+18 |
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Changed /images and /fonts to /assets in the examples of image_path, image_tag and font_path helpers [ci skip] | ||||
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-12 | 1 | -42/+44 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/callbacks.rb | ||||
| * | | | | Move HTTP Token auth docs above the Token module | Elia Schito | 2012-05-11 | 1 | -42/+44 |
| | | | | | |||||
* | | | | | Revert "Merge pull request #6142 from spartan-developer/master" | José Valim | 2012-05-12 | 4 | -10/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 667d0bdd90ef6e6b691f0cc4cf5535b8da69f248, reversing changes made to 4ae6bab6bb02c9390188a49f9a749400f6a0ac94. | ||||
* | | | | | mispelling errors in render_text_test.rb and sqlite_specific_schema | angelo giovanni capilleri | 2012-05-12 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #6142 from spartan-developer/master | José Valim | 2012-05-12 | 4 | -12/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | refactored extracting :size => 'XxY' into an extract_size! method | ||||
| * | | | | | refactored extracting :size => 'XxY' into an extract_size! method | Nicholas Yianilos | 2012-05-03 | 4 | -12/+10 |
| | | | | | | |||||
* | | | | | | mispelling error in actionpach changelog | angelo giovanni capilleri | 2012-05-12 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Add test directory to TestTask's libs | Santiago Pastorino | 2012-05-11 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | Remove useless load path modifications | Santiago Pastorino | 2012-05-11 | 4 | -18/+0 |
| | | | | | | |||||
* | | | | | | Lazy load I18n | Santiago Pastorino | 2012-05-11 | 1 | -2/+3 |
| | | | | | | |||||
* | | | | | | Move require to where it's needed | Santiago Pastorino | 2012-05-11 | 6 | -3/+6 |
| | | | | | | |||||
* | | | | | | Remove ruby/shim | Santiago Pastorino | 2012-05-11 | 2 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | require 'action_view' is now much faster | ||||
* | | | | | | Copy literal route constraints to defaults - fixes #3571 and #6224. | Andrew White | 2012-05-11 | 4 | -3/+69 |
| | | | | | | |||||
* | | | | | | Don't ignore nil positional arguments for url helpers - fixes #6196. | Andrew White | 2012-05-10 | 2 | -1/+36 |
| | | | | | | |||||
* | | | | | | Refactor the handling of default_url_options in integration tests | Andrew White | 2012-05-10 | 2 | -7/+104 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | | | | remove duplicate usage of Rack::Utils.status_code in ↵ | Rafael Magana | 2012-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | LogSubscriber#process_action |