Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '3-1-stable' | Joshua Peek | 2011-05-22 | 1 | -15/+47 |
|\ | | | | | | | | | | | Conflicts: actionpack/actionpack.gemspec activemodel/activemodel.gemspec | ||||
| * | Add debug_asset support | Joshua Peek | 2011-05-22 | 1 | -15/+47 |
| | | |||||
* | | Edited actionpack/lib/action_view/helpers/form_helper.rb via GitHub | José Valim | 2011-05-22 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #1189 from jmbejar/7c562d5e460d97b18e4f3367b3cfb13401732920 | José Valim | 2011-05-22 | 1 | -0/+19 |
|\ \ | |/ |/| | Add method FormHelper#fields_for_with_index | ||||
| * | Add method fields_for_with_index to FormHelper | Jorge Bejar | 2011-05-21 | 1 | -0/+19 |
| | | |||||
* | | fixed some ruby 19 warnings, including circular requires and variable name reuse | Josh Kalderimis | 2011-05-21 | 2 | -2/+0 |
|/ | |||||
* | Example Usage updated for actionpack and actionmailer. | Arun Agrawal | 2011-05-19 | 1 | -2/+2 |
| | |||||
* | Merge pull request #568 from carlosantoniodasilva/fields_for_fixes | José Valim | 2011-05-15 | 1 | -36/+26 |
|\ | | | | | Fields for fixes for non nested attributes and without object | ||||
| * | Use record_name to make fields for methods more consistent | Carlos Antonio da Silva | 2011-05-14 | 1 | -6/+6 |
| | | |||||
| * | Refactor fields_for to make the api more clear, and fix usage with non ↵ | Carlos Antonio da Silva | 2011-05-14 | 1 | -26/+19 |
| | | | | | | | | nested attributes and without object | ||||
| * | Cleanup instantiate builder method definition | Carlos Antonio da Silva | 2011-05-14 | 1 | -5/+2 |
| | | |||||
* | | Clean up redundant backslashes | Pirogov Evgenij | 2011-05-14 | 1 | -4/+4 |
|/ | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-14 | 9 | -94/+101 |
|\ | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/date_helper.rb railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt | ||||
| * | Follow code conventions on docs | Sebastian Martinez | 2011-05-10 | 2 | -7/+7 |
| | | |||||
| * | Fix styiling issues on DateHelper docs | Sebastian Martinez | 2011-05-10 | 1 | -64/+70 |
| | | |||||
| * | Fix styiling issues on AtomFeedHelper docs | Sebastian Martinez | 2011-05-10 | 1 | -4/+4 |
| | | |||||
| * | Remove extra whitespace. | Sebastian Martinez | 2011-05-10 | 1 | -1/+1 |
| | | |||||
| * | Fix styiling issue on TranslationHelper docs | Sebastian Martinez | 2011-05-10 | 1 | -4/+4 |
| | | |||||
| * | Fix styiling issue on ActionView::Template docs | Sebastian Martinez | 2011-05-10 | 1 | -5/+5 |
| | | |||||
| * | Explain the implication of using :ignore_date on time_select | Aditya Sanghi | 2011-05-10 | 1 | -1/+2 |
| | | |||||
| * | Fixed typos in documentation for the date_select helper in ↵ | Philip Roberts | 2011-05-09 | 1 | -1/+1 |
| | | | | | | | | | | | | actionpack/action_view. The description for an example of the date_select method did not match the actual code example. | ||||
| * | Documentation fix. Corrected a copy/paste mistake for link_to_if documentation. | Ryan Sandridge | 2011-05-08 | 1 | -1/+1 |
| | | |||||
| * | Fixed documentation of select tag; options with html need to pass through ↵ | Jason | 2011-05-08 | 1 | -6/+6 |
| | | | | | | | | | | | | html_safe https://github.com/rails/rails/issues/447 https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/6759-api-document-incorrect | ||||
* | | Add tests for content_for() for read, closes #475. | José Valim | 2011-05-10 | 1 | -2/+6 |
| | | |||||
* | | Optimize the most common resolver case. | José Valim | 2011-05-09 | 2 | -14/+27 |
| | | |||||
* | | No need for replace. | José Valim | 2011-05-09 | 1 | -12/+11 |
| | | |||||
* | | Revert to use === only here because of perf. :( | José Valim | 2011-05-08 | 1 | -3/+1 |
| | | |||||
* | | Merge pull request #420 from burke/master | José Valim | 2011-05-08 | 2 | -1/+5 |
|\ \ | | | | | | | Accept single prefix in ActionView::MissingTemplate#initialize | ||||
| * | | Added activesupport requires for Array.wrap in previously modified files | Burke Libbey | 2011-05-07 | 2 | -0/+3 |
| | | | |||||
| * | | Remove redundant check for is_a?(String) | Burke Libbey | 2011-05-06 | 2 | -2/+2 |
| | | | |||||
| * | | Added a test for MissingTemplate change, and changed to use Array.wrap() as | Burke Libbey | 2011-05-06 | 2 | -2/+2 |
| | | | | | | | | | | | | requested by josevalim. | ||||
| * | | Made ActionView::MissingTemplate#initialize optionally accept a single string | Burke Libbey | 2011-05-06 | 1 | -0/+1 |
| | | | | | | | | | | | | prefix to be converted to an array as in ActionView::PathSet#find_all. | ||||
* | | | Always expand */* | José Valim | 2011-05-07 | 1 | -7/+4 |
| | | | |||||
* | | | Fixes ticket #6379. Improved the handling of Accept headers containing */*. | mathieuravaux | 2011-05-07 | 1 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | | `lookup_context#formats=` being too restrictive, "Accept: text/javascript, */*" resulted in [:js, "*/*"] formats instead of [:js, :html]. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | | Merge pull request #343 from asanghi/ampm | José Valim | 2011-05-07 | 1 | -4/+30 |
|\ \ \ | |/ / |/| | | Allow AM/PM format in datetime selectors | ||||
| * | | DRY this baby up | Aditya Sanghi | 2011-04-29 | 1 | -23/+4 |
| | | | |||||
| * | | add more documentation; remove unused assignment | Aditya Sanghi | 2011-04-29 | 1 | -4/+14 |
| | | | |||||
| * | | Allow AM/PM in datetime selectors | Aditya Sanghi | 2011-04-29 | 1 | -0/+35 |
| | | | |||||
* | | | strip space | Aditya Sanghi | 2011-05-06 | 1 | -2/+2 |
| | | | |||||
* | | | Take leap years into account more seriously when calculating year distance ↵ | Aditya Sanghi | 2011-05-06 | 1 | -3/+14 |
| |/ |/| | | | | | [#6074 state:resolved] | ||||
* | | Use remove possible method here. | José Valim | 2011-05-04 | 1 | -1/+2 |
| | | |||||
* | | More AV::Base cleanup. | José Valim | 2011-05-04 | 3 | -28/+52 |
| | | |||||
* | | Move prefixes to view paths as they are now a lookup context dependency. | José Valim | 2011-05-04 | 1 | -0/+2 |
| | | |||||
* | | restores the -j option, but now it accepts the name of any library | Xavier Noria | 2011-05-04 | 1 | -1/+1 |
| | | | | | | | | | | | | If passed "foo", a gem "foo-rails" is added to the Gemfile and "foo" and "foo_ujs" are required in the application JavaScript manifest. | ||||
* | | Also allow prefixes as third argument to lookup context. | José Valim | 2011-05-04 | 2 | -3/+3 |
| | | |||||
* | | no @controller dependency in Renderers. | Nick Sutterer | 2011-05-04 | 4 | -18/+13 |
| | | |||||
* | | initialize prefixes in LookupContext. | Nick Sutterer | 2011-05-04 | 1 | -0/+1 |
| | | |||||
* | | added :prefixes accessor to LookupContext. | Nick Sutterer | 2011-05-03 | 1 | -0/+2 |
| | | |||||
* | | Merge pull request #378 from danielvlopes/master. | José Valim | 2011-05-03 | 1 | -6/+16 |
|\ \ | | | | | | | Select_tag should have the same API of select from form_builder | ||||
| * | | fix select_tag to have the same behavior of select | Daniel Lopes | 2011-05-03 | 1 | -6/+16 |
| | | |