Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Updating requirement for mail to 1.3.3 | Mikel Lindsaar | 2009-12-17 | 1 | -1/+1 |
| | |||||
* | Merged in latest changes from rails/master | Mikel Lindsaar | 2009-12-17 | 4 | -3/+24 |
| | |||||
* | Fixes for working with 1.9.1-head | Mikel Lindsaar | 2009-12-17 | 5 | -24/+10 |
| | |||||
* | Merge branch 'rails' | Mikel Lindsaar | 2009-12-17 | 217 | -2750/+3351 |
|\ | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer.rb actionmailer/lib/action_mailer/delivery_method/smtp.rb | ||||
| * | Need to lazy realize middleware options so they can be modified in | Joshua Peek | 2009-12-16 | 1 | -3/+3 |
| | | | | | | | | the environment | ||||
| * | Use AbstractController error constants | Joshua Peek | 2009-12-16 | 1 | -3/+2 |
| | | |||||
| * | Fully expand relative rails framework paths and make sure we aren't | Joshua Peek | 2009-12-16 | 15 | -61/+62 |
| | | | | | | | | adding any to the load path more than once. | ||||
| * | Hush AMo test suite | Joshua Peek | 2009-12-16 | 1 | -1/+0 |
| | | |||||
| * | ARes rake task should not worry about AS being in path | Joshua Peek | 2009-12-16 | 1 | -2/+0 |
| | | |||||
| * | Hush ARes test suite | Joshua Peek | 2009-12-16 | 1 | -1/+0 |
| | | |||||
| * | Hush AM test suite | Joshua Peek | 2009-12-16 | 1 | -1/+0 |
| | | |||||
| * | Hush AS test suite | Joshua Peek | 2009-12-16 | 1 | -1/+0 |
| | | |||||
| * | When passing force_reload = true to an association, don't use the query ↵ | Will | 2009-12-16 | 2 | -2/+12 |
| | | | | | | | | | | | | cache [#1827 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Add the ability for plugins to set default configuration settings. | Carl Lerche | 2009-12-15 | 7 | -18/+142 |
| | | |||||
| * | Procs don't call themselves | Joshua Peek | 2009-12-15 | 2 | -1/+33 |
| | | | | | | | | Fixes dev mode reloading [#3574 state:resolved] | ||||
| * | Add test for TimeWithZone#to_i with wrapped DateTime | Geoff Buesing | 2009-12-15 | 1 | -0/+6 |
| | | |||||
| * | Added #to_i to DateTime in ActiveSupport so #to_yaml works correctly on ↵ | Serguei Filimonov | 2009-12-15 | 3 | -2/+28 |
| | | | | | | | | ActiveRecord models with DateTime attributes. | ||||
| * | Add Enumerable#exclude? to bring parity to Enumerable#include? and avoid if ↵ | David Heinemeier Hansson | 2009-12-14 | 3 | -0/+12 |
| | | | | | | | | !x.include?/else calls [DHH] | ||||
| * | Move route reloading into railties | Joshua Peek | 2009-12-14 | 7 | -115/+69 |
| | | |||||
| * | Remove route loading tests since it should be tested by railties | Joshua Peek | 2009-12-14 | 1 | -72/+0 |
| | | |||||
| * | Fix loading plugin and engine route sets | Joshua Peek | 2009-12-14 | 2 | -5/+58 |
| | | |||||
| * | Fix response_body warning in AC | Joshua Peek | 2009-12-14 | 1 | -0/+2 |
| | | |||||
| * | Hush loading AR unless it fails | Joshua Peek | 2009-12-14 | 1 | -6/+2 |
| | | |||||
| * | Hush AP test suite | Joshua Peek | 2009-12-14 | 1 | -2/+0 |
| | | |||||
| * | Fix warning in AC flash | Joshua Peek | 2009-12-14 | 1 | -0/+1 |
| | | |||||
| * | Fix warnings in AD::Response | Joshua Peek | 2009-12-14 | 1 | -0/+3 |
| | | |||||
| * | Fix warnings in railties configuration and initializeable | Joshua Peek | 2009-12-14 | 2 | -11/+15 |
| | | |||||
| * | Modify backtrace test to take implementations with slightly different ↵ | Yehuda Katz | 2009-12-13 | 1 | -1/+1 |
| | | | | | | | | backtrace output into consideration. | ||||
| * | Extract descendents a bit so it can take advantage of Rubinius' __subclasses__. | Yehuda Katz | 2009-12-13 | 2 | -34/+45 |
| | | |||||
| * | Forgot to revert tests from that last commit | Joshua Peek | 2009-12-12 | 1 | -8/+0 |
| | | |||||
| * | Revert "Fix instance_eval calls to association proxies" | Joshua Peek | 2009-12-12 | 2 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | I think it may of broke the build. Lets see. This reverts commit 49e943c4f0ac3459bd53023167aaa08fc8e46733. Conflicts: activerecord/test/cases/associations/has_many_associations_test.rb | ||||
| * | rendering controller needs base | Joshua Peek | 2009-12-12 | 1 | -0/+1 |
| | | |||||
| * | Don't require AD test_case | Joshua Peek | 2009-12-12 | 2 | -2/+0 |
| | | |||||
| * | Nearly all AC modules can be deferred | Joshua Peek | 2009-12-12 | 1 | -40/+44 |
| | | |||||
| * | All AbstractController modules are deferrable | Joshua Peek | 2009-12-12 | 1 | -7/+9 |
| | | |||||
| * | Relocate AbstractController exceptions into their proper parent modules | Joshua Peek | 2009-12-12 | 4 | -26/+17 |
| | | |||||
| * | Allow autoloads to opt out of eager loading | Joshua Peek | 2009-12-12 | 7 | -36/+47 |
| | | |||||
| * | TestProcess belongs in AD | Joshua Peek | 2009-12-12 | 10 | -129/+109 |
| | | |||||
| * | Fix postgresql AR test failure | John Pignata | 2009-12-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Due to the ordering of the returning result set, the test fails under the postgresql adapter. Order results by id prior to checking the first item [#3542 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | "new" and "edit" name routes always need to be prepend to the | Joshua Peek | 2009-12-11 | 2 | -6/+37 |
| | | | | | | | | named_route [#3561 state:resolved] | ||||
| * | Use rackmounts recognize api and don't piggyback recognize_path on | Joshua Peek | 2009-12-11 | 2 | -21/+30 |
| | | | | | | | | top of rack call | ||||
| * | Remove fancy method not allowed resource exceptions since they are | Joshua Peek | 2009-12-11 | 4 | -43/+9 |
| | | | | | | | | too much of a hack | ||||
| * | Kill RouteSet#recognize | Joshua Peek | 2009-12-10 | 3 | -140/+72 |
| | | |||||
| * | Cleanup generate_extras build/parse mess | Joshua Peek | 2009-12-10 | 1 | -9/+3 |
| | | |||||
| * | Reduce usage of interpret_status. It should also return a integer | Joshua Peek | 2009-12-10 | 3 | -24/+13 |
| | | | | | | | | not a string. | ||||
| * | Add autoloads for ActionView::Template* classes, and an ↵ | Nathan Weizenbaum | 2009-12-10 | 2 | -1/+7 |
| | | | | | | | | | | | | ActionView::TemplateError alias for ActionView::Template::Error. Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | ||||
| * | Merge branch 'master' of github.com:rails/rails | Yehuda Katz | 2009-12-10 | 30 | -501/+520 |
| |\ | |||||
| | * | Check block arity passed to routes draw so you don't need to use | Joshua Peek | 2009-12-09 | 2 | -2/+9 |
| | | | | | | | | | | | | |map| | ||||
| | * | Fixed old routing mapper example in generated routes.rb | Joshua Peek | 2009-12-09 | 2 | -2/+2 |
| | | | |||||
| | * | Scaffolding generates new routing dsl examples | Joshua Peek | 2009-12-09 | 8 | -30/+47 |
| | | |