| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge commit 'mainstream/master' | Pratik Naik | 2009-06-01 | 5 | -13/+27 |
|\ |
|
| * | fix for IE incompatibility of :disable_with in submit_tag | Han Kessels | 2009-06-01 | 1 | -1/+2 |
| * | Ruby 1.9: ERB template encoding using a magic comment at the top of the file | Jeremy Kemper | 2009-05-28 | 2 | -8/+14 |
| * | Ruby 1.9: flushing the output buffer preserves its encoding | Jeremy Kemper | 2009-05-28 | 1 | -3/+10 |
| * | Break up DependencyModule's dual function of providing a "depend_on" DSL and ... | Joshua Peek | 2009-05-28 | 1 | -1/+1 |
* | | a few details here and there in url_helper.rb docs | Xavier Noria | 2009-05-24 | 1 | -47/+46 |
* | | Updated examples to use latest config structure | Lloyd Pick | 2009-05-24 | 1 | -4/+4 |
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-05-24 | 13 | -28/+73 |
|\| |
|
| * | Get controller/render_other_test.rb to pass on new base and fixed a bug in ne... | Yehuda Katz + Carl Lerche | 2009-05-22 | 1 | -1/+2 |
| * | Get controller/layout_test.rb running on new base except for ActionController... | Yehuda Katz + Carl Lerche | 2009-05-22 | 2 | -1/+5 |
| * | Make assertion tests pass with the new base | Pratik Naik | 2009-05-22 | 1 | -1/+1 |
| * | Move Safari response-padding fix to Rails2Compatibility. Should be a Rack con... | Jeremy Kemper | 2009-05-21 | 1 | -1/+1 |
| * | Added the :rjs render option | Yehuda Katz + Carl Lerche | 2009-05-21 | 3 | -8/+12 |
| * | Remove some response content type concepts from ActionView | Yehuda Katz + Carl Lerche | 2009-05-21 | 6 | -9/+28 |
| * | Added responds_to to new base. | Yehuda Katz + Carl Lerche | 2009-05-20 | 1 | -1/+6 |
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-05-18 | 1 | -1/+6 |
| |\ |
|
| | * | Truncate helper accepts a :separator for a more legible result [#1807 state:r... | Andy Stewart | 2009-05-18 | 1 | -1/+6 |
| * | | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-05-18 | 5 | -9/+17 |
| |\| |
|
| | * | Ensure number_to_human_size does not strip zeros from the end [#1763 state:re... | Travis Briggs | 2009-05-17 | 1 | -1/+6 |
| | * | Ensure auto_link does not ignore multiple trailing punctuations [#2504 state:... | Lance Ivy | 2009-05-17 | 1 | -6/+7 |
| | * | Fix ActionMailer Symbol#to_proc instance | Yehuda Katz | 2009-05-16 | 1 | -1/+1 |
| * | | Active Support dependencies | Jeremy Kemper | 2009-05-14 | 1 | -0/+1 |
* | | | Fixed a typo | Thomas R. Koll | 2009-05-24 | 1 | -2/+2 |
* | | | Merge commit 'mainstream/master' | Pratik Naik | 2009-05-15 | 10 | -23/+46 |
|\ \ \
| | |/
| |/| |
|
| * | | Allow strings to be sent as collection to select. | José Valim | 2009-05-15 | 1 | -0/+2 |
| * | | Cleaning up more render tests | Yehuda Katz + Carl Lerche | 2009-05-14 | 1 | -1/+1 |
| |/ |
|
| * | Cherry-pick core extensions | Jeremy Kemper | 2009-05-13 | 3 | -4/+9 |
| * | Implemented redirects and partial rendering in new base. | Yehuda Katz + Carl Lerche | 2009-05-12 | 2 | -12/+25 |
| * | Merge branch 'master' into wip_abstract_controller | Yehuda Katz + Carl Lerche | 2009-05-11 | 1 | -1/+1 |
| |\ |
|
| * | | Ported ConditionalGet to new Base | Yehuda Katz + Carl Lerche | 2009-05-11 | 1 | -0/+2 |
| * | | More community code review :) | Yehuda Katz | 2009-05-11 | 1 | -0/+2 |
| * | | Support implicit and explicit content types | Yehuda Katz + Carl Lerche | 2009-05-01 | 1 | -2/+1 |
| |/ |
|
| * | Move generic assertions into ActionDispatch | Joshua Peek | 2009-04-30 | 1 | -1/+1 |
* | | Some spelling changes. | Evan Farrar | 2009-05-07 | 4 | -9/+9 |
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-04-30 | 9 | -218/+135 |
|\| |
|
| * | Deprecate template, session, assigns, and layout accessors on response object... | Joshua Peek | 2009-04-28 | 3 | -4/+5 |
| * | Fixes ActionMailer to work with the ActionView refactoring | Yehuda Katz + Carl Lerche | 2009-04-27 | 1 | -151/+1 |
| * | Refactor ActionView::Template | Yehuda Katz + Carl Lerche | 2009-04-27 | 8 | -189/+257 |
| * | Now that we have a separate internal rails_to_json, use a separate circular r... | Jeremy Kemper | 2009-04-26 | 1 | -2/+2 |
| * | Use javascript_object_for | Jeremy Kemper | 2009-04-26 | 1 | -1/+1 |
| * | Only Object to_json alias is needed. Prefer nil options. | Jeremy Kemper | 2009-04-26 | 1 | -2/+0 |
| * | Qualify toplevel constant references since we're in a BasicObject | Jeremy Kemper | 2009-04-26 | 1 | -7/+7 |
* | | fixes an example from the previous commit | Xavier Noria | 2009-04-27 | 1 | -2/+2 |
* | | adds timestamps in examples of generated asset paths, and documents this bit ... | Xavier Noria | 2009-04-27 | 1 | -69/+72 |
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-04-23 | 9 | -75/+127 |
|\| |
|
| * | * Add pluggable JSON backends with support for the JSON gem. [rick] | rick | 2009-04-23 | 2 | -12/+14 |
| * | Refactor ActionView::Path | Yehuda Katz + Carl Lerche | 2009-04-22 | 6 | -63/+111 |
| * | Fix tests on 1.9 | Jeremy Kemper | 2009-04-22 | 1 | -0/+2 |
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-04-23 | 1 | -0/+1 |
|\| |
|
| * | Opt in to Dependencies | Jeremy Kemper | 2009-04-22 | 1 | -0/+1 |