| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
| * | 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 |
* | | Active Support dependencies | Jeremy Kemper | 2009-05-14 | 1 | -0/+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 |
* | 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 |
* | * 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 |
* | Opt in to Dependencies | Jeremy Kemper | 2009-04-22 | 1 | -0/+1 |
* | Merge docrails | lifo | 2009-04-17 | 2 | -4/+4 |
* | Make more Template methods public to make ActionMailer tests pass | Carl Lerche & Yehuda Katz | 2009-04-16 | 1 | -8/+8 |
* | Makes rails-dev-boost work again | Carl Lerche & Yehuda Katz | 2009-04-14 | 4 | -106/+110 |
* | Move all Templates methods not used by other class into private to | Carl Lerche & Yehuda Katz | 2009-04-14 | 1 | -87/+88 |
* | Resurrecting 1.9 compatibility. | Carl Lerche & Yehuda Katz | 2009-04-13 | 1 | -1/+1 |
* | Bring abstract_controller up to date with rails/master | Carl Lerche & Yehuda Katz | 2009-04-13 | 18 | -156/+563 |
|\ |
|
| * | Object names with underscore do the wrong lookup in I18n on error_messages_for. | José Valim | 2009-04-05 | 1 | -1/+1 |
| * | Fix template extension parsing. [#2315 state:resolved] [#2284 state:resolved] | thedarkone | 2009-03-24 | 1 | -30/+14 |
| * | Simplify handling of absolute path templates. [#2276 state:resolved] | thedarkone | 2009-03-24 | 2 | -4/+9 |
| * | Merge docrails | Pratik Naik | 2009-03-24 | 2 | -17/+24 |
| * | pluginize concurrent block body part | Jeremy Kemper | 2009-03-19 | 2 | -27/+2 |
| * | Merge branch 'master' into bodyparts | Jeremy Kemper | 2009-03-18 | 4 | -5/+5 |
| |\ |
|
| | * | Merge docrails | Pratik Naik | 2009-03-16 | 2 | -3/+3 |
| | * | ruby 1.9 compat: Pathname doesn't support =~ | Joshua Peek | 2009-03-15 | 1 | -1/+1 |
| | * | allowed render :file to take Pathnames [#2220 state:resolved] | misfo | 2009-03-14 | 1 | -1/+1 |
| * | | Less ceremony | Jeremy Kemper | 2009-03-13 | 4 | -60/+25 |
| * | | Simplify parts and tests | Jeremy Kemper | 2009-03-13 | 3 | -25/+17 |
| * | | Example using an edge side include body part to fetch queued rendering results | Jeremy Kemper | 2009-03-13 | 1 | -13/+0 |
| * | | Body parts: future rendering, threaded future, queued future, open-uri example | Jeremy Kemper | 2009-03-13 | 5 | -2/+89 |
| * | | Merge branch 'master' into bodyparts | Jeremy Kemper | 2009-03-13 | 1 | -5/+5 |
| |\| |
|
| | * | Change naming to match 2.2 so life is easier on plugin developers | Jeremy Kemper | 2009-03-12 | 1 | -5/+5 |
| | * | Eliminate internal render stack since we only need its head and tail | Jeremy Kemper | 2009-03-12 | 2 | -17/+27 |
| * | | Introduce flush_output_buffer to append the buffer to the response body then ... | Jeremy Kemper | 2009-03-13 | 1 | -0/+8 |
| * | | Eliminate internal render stack since we only need its head and tail | Jeremy Kemper | 2009-03-12 | 2 | -17/+27 |
| |/ |
|
| * | Ensure auto_link doesnt linkify URLs in the middle of a tag [#1523 state:reso... | Eugene Pimenov | 2009-03-10 | 1 | -2/+3 |