| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix NumberHelper options wrapping to prevent verbatim blocks being rendered ↵ | Mark J. Titorenko | 2012-07-02 | 1 | -90/+159 |
| | | | | | | | | | | | instead of line continuations. While I'm at it, wrap long comment lines consistently. Conflicts: actionpack/lib/action_view/helpers/number_helper.rb There was just one conflict related to the addition of the :format option to number_to_percentage. | ||||
| * | Merge pull request #6649 from route/logger_in_metal_3_2 | Carlos Antonio da Silva | 2012-06-18 | 1 | -2/+4 |
| |\ | | | | | Logger in metal backport for 3.2 | ||||
| | * | ActionController::Metal doesn't have logger method, check it and then delegate | Dmitry Vorotilin | 2012-06-16 | 1 | -2/+4 |
| | | | |||||
| * | | Merge pull request #6752 from steveklabnik/fix_5680 | Rafael Mendonça França | 2012-06-16 | 1 | -1/+7 |
| |/ | | | | Respect absolute paths in compute_source_path. | ||||
| * | Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` option | Carlos Galdino | 2012-06-05 | 2 | -2/+13 |
| | | | | | | | | | | | | | This deprecation applies to: `button_to` `button_tag` `image_submit_tag` `link_to` `submit_tag` As :confirm is an UI specific option is better to use the data attributes, teaching users about unobtrusive JavaScript and how Rails works with it. | ||||
| * | Allow to use mounted helpers in ActionView::TestCase | Piotr Sarnacki | 2012-06-01 | 1 | -1/+2 |
| | | | | | | Similarly to 6525002, this allows to use routes helpers for mounted helpers, but this time in ActionView::TestCase | ||||
| * | Merge pull request #6410 from Bodacious/tag_helper_data_fix_3-2-stable | Rafael Mendonça França | 2012-05-20 | 1 | -1/+1 |
| |\ | | | | | TagHelper creates invalid data attributes when value is a BigDecimal | ||||
| | * | Fixed tag_helper data-attribute bug with BigDecimals | Bodacious | 2012-05-20 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #6407 from pinetops/565c1b0a0772ac6cf91c77e9285806f7b028614c | José Valim | 2012-05-20 | 1 | -10/+22 |
| |\ \ | |/ |/| | Template concurrency fixes | ||||
| | * | Prevent concurrent compilation of templates - closes #6400 | Tom Clarke | 2012-05-20 | 1 | -10/+22 |
| | | | |||||
| | * | Set proper rendered_format when doing render :inline | Santiago Pastorino | 2012-03-28 | 1 | -2/+2 |
| | | | | | | | | | Closes #5632 | ||||
| | * | Cover one more case in auth_token and remote forms | Piotr Sarnacki | 2012-03-28 | 1 | -1/+1 |
| | | | | | | | | | | | If embedding auth_token in remote forms is off and we pass a value for auth_token it should respect it. | ||||
| | * | Merge pull request #5633 from drogus/embed-auth-token-in-remote-forms | Santiago Pastorino | 2012-03-28 | 2 | -8/+24 |
| | | | | | | | | | Embed auth token in remote forms | ||||
| | * | Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-haml | Santiago Pastorino | 2012-03-27 | 2 | -2/+6 |
| | | | | | | | | | Textarea newline fix breaks haml (3-2-stable) | ||||
| * | | Use right option for excerpt text helper in tests, fix build | Carlos Antonio da Silva | 2012-05-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | `excerpt` text helper uses `:radius`, not `line_width` (that is used by `word_wrap` helper). Also cleanup some whitespaces. | ||||
| * | | Merge pull request #5020 from KL-7/fix-blank-image_tag-source | José Valim | 2012-05-18 | 1 | -2/+2 |
| | | | | | | | | | Render img tag with empty src if empty string is passed to image_tag. | ||||
| * | | Deprecate old APIs for highlight, excerpt and word_wrap | Jeremy Walker | 2012-05-18 | 1 | -0/+9 |
| | | | |||||
| * | | Deprecate `:disable_with` for `button_tag` too | Carlos Galdino + Rafael Mendonça França | 2012-05-14 | 2 | -2/+4 |
| | | | |||||
| * | | Fix typo | Carlos Galdino + Rafael Mendonça França | 2012-05-14 | 1 | -1/+1 |
| | | | |||||
| * | | Deprecate `:disable_with` in favor of `'data-disable-with'` option for ↵ | Carlos Galdino + Rafael Mendonça França | 2012-05-14 | 2 | -6/+13 |
| | | | | | | | | | `button_to` and `submit_tag` helpers. | ||||
| * | | Deprecate `:mouseover` options for `image_tag` helper. | Rafael Mendonça França | 2012-05-13 | 1 | -0/+2 |
| | | | |||||
| * | | Merge pull request #3237 from sakuro/data-url-scheme | Rafael Mendonça França | 2012-05-13 | 2 | -2/+2 |
| | | | | | | | | | Support data: url scheme | ||||
| * | | Deprecate link_to_function and button_to_function helpers | Rafael Mendonça França | 2012-04-30 | 1 | -0/+4 |
| | | | |||||
| * | | Add missing require when helpers are used in isolation | Rafael Mendonça França | 2012-04-30 | 1 | -0/+1 |
| | | | |||||
| * | | Lazy load `default_form_builder` if it's passed as a string | Piotr Sarnacki | 2012-04-28 | 1 | -1/+7 |
| | | | | | | | | | closes #3341 | ||||
| * | | Do not mutate options hash | Carlos Antonio da Silva | 2012-04-27 | 1 | -2/+2 |
| | | | |||||
| * | | fix number_to_human docs [ci skip] | Vijay Dev | 2012-04-26 | 1 | -2/+2 |
| | | | |||||
| * | | converting some tests to assert_raises, and DRY'ing retrieve_variable changes | Tieg Zaharia | 2012-04-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | Conflicts: actionpack/test/template/render_test.rb | ||||
| * | | catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead | Tieg Zaharia | 2012-04-16 | 1 | -1/+1 |
| | | | |||||
| * | | Set proper rendered_format when doing render :inline | Santiago Pastorino | 2012-03-28 | 1 | -2/+2 |
| | | | | | | | | | Closes #5632 | ||||
| * | | Cover one more case in auth_token and remote forms | Piotr Sarnacki | 2012-03-28 | 1 | -1/+1 |
| | | | | | | | | | | | If embedding auth_token in remote forms is off and we pass a value for auth_token it should respect it. | ||||
| * | | Added config.action_view.embed_authenticity_token_in_remote_forms | Piotr Sarnacki | 2012-03-28 | 2 | -8/+24 |
| | | | | | | | | | | | | | | | | | There is a regression introduced in 16ee611fa, which breaks remote forms that should also work without javascript. This commit introduces config option that allows to configure this behavior defaulting to the old behavior (ie. include authenticity token in remote forms by default) | ||||
| * | | Merge pull request #5622 from rafaelfranca/fix-2492-3-2 | Jeremy Kemper | 2012-03-27 | 1 | -2/+3 |
| |\ \ | | | | | | | [3-2-stable] Fix label_tag to merge the options hash with the object hash | ||||
| | * | | Check if the options hash already exists and merge it with the another | Rafael Mendonça França | 2012-03-27 | 1 | -10/+5 |
| | | | | | | | | | | | | | | | | | | | hash. Closes #2492 and #5614 | ||||
| | * | | Fixing issue #2492. ActionView::Base.field_error_proc doesn't call for label. | Andrey Samsonov | 2012-03-27 | 1 | -2/+8 |
| | |/ | | | | | | | | | | | objectify_options method should be applied to the proper options arg. See explanation and example of the bug - https://github.com/kryzhovnik/rails_field_error_proc_bug_example | ||||
| * | | Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-haml | Santiago Pastorino | 2012-03-27 | 2 | -2/+6 |
| |\ \ | |/ |/| | Textarea newline fix breaks haml (3-2-stable) | ||||
| | * | Don't break Haml with textarea newline fix. | James Coleman | 2012-03-27 | 2 | -2/+6 |
| | | | | | | | | | | | | | See issue #393, issue #4000, issue #5190, and issue #5191. Adds a newline after the textarea opening tag based on @codykrieger's original patch so that we don't cause regressions in Haml-using apps. The regression caused textarea tags to add newlines to the field unintentionally (each update/save added an extra newline.) Also fix 6 more tests that didn't yet have the newline expectation. | ||||
| * | | If partial is rendered in controller, grab format from template | Piotr Sarnacki | 2012-03-27 | 1 | -2/+8 |
| |/ | | | | | | | | | Previously `rendered_format` was set only based on mime types passed in Accept header, which was wrong if first type from Accept was different than rendered partial. The fix is to simply move setting rendered_format to the place where template is available and grab format from the template. If it fails we can fallback to formats passed by Accept header. | ||||
| * | apply form_for namespace option to date_select | Sergey Nartimov | 2012-03-26 | 1 | -1/+4 |
| | | |||||
| * | Allow you to force the authenticity_token to be rendered even on remote ↵ | David Heinemeier Hansson | 2012-03-14 | 1 | -5/+9 |
| | | | | | forms if you pass true | ||||
| * | Do not include the authenticity token in forms where remote: true as ajax ↵ | David Heinemeier Hansson | 2012-03-14 | 1 | -2/+9 |
| | | | | | forms use the meta-tag value | ||||
| * | Just change the formats on first render, closes #5307, closes #5308. | José Valim | 2012-03-07 | 1 | -2/+7 |
| | | |||||
| * | Fix #5238, rendered_format is not set when template is not rendered | Piotr Sarnacki | 2012-03-02 | 1 | -0/+2 |
| | | |||||
| * | Merge branch '3-2-2' into 3-2-stable | Aaron Patterson | 2012-03-01 | 2 | -4/+4 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-2: bumping to 3.2.2 Ensure [] respects the status of the buffer. Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare Merge pull request #5084 from johndouthat/patch-1 updating RAILS_VERSION delete vulnerable AS::SafeBuffer#[] use AS::SafeBuffer#clone_empty for flushing the output_buffer add AS::SafeBuffer#clone_empty fix output safety issue with select options | ||||
| | * | Merge branch '3-2-stable-security' into 3-2-2 | Aaron Patterson | 2012-03-01 | 2 | -4/+4 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-stable-security: Ensure [] respects the status of the buffer. delete vulnerable AS::SafeBuffer#[] use AS::SafeBuffer#clone_empty for flushing the output_buffer add AS::SafeBuffer#clone_empty fix output safety issue with select options | ||||
| | | * | use AS::SafeBuffer#clone_empty for flushing the output_buffer | Akira Matsuda | 2012-02-20 | 1 | -1/+1 |
| | | | | |||||
| | | * | fix output safety issue with select options | Sergey Nartimov | 2012-02-20 | 1 | -3/+3 |
| | | | | |||||
| * | | | Add a new line after the textarea opening tag. | Rafael Mendonça França | 2012-02-27 | 1 | -1/+1 |
| |/ / | | | | | | | Closes #393 | ||||
| * | | format lookup for partials is derived from the format in which the template ↵ | Santiago Pastorino | 2012-02-22 | 5 | -28/+12 |
| | | | | | | | | | | | | | is being rendered Closes #5025 part 2 | ||||
| * | | fix bad docs from f373f296 [ci skip] | Vijay Dev | 2012-02-21 | 1 | -3/+3 |
| | | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |