Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'rails/master' | Emilio Tagua | 2009-06-23 | 100 | -698/+813 |
|\ | |||||
| * | Small changes to get 1.9 passing (for the most part) | Yehuda Katz | 2009-06-23 | 2 | -2/+2 |
| | | |||||
| * | Revert "Generate proper :counter_sql from :finder_sql when there is a ↵ | Yehuda Katz + Carl Lerche | 2009-06-22 | 14 | -55/+39 |
| | | | | | | | | | | | | | | | | newline character immediately following 'SELECT' [#2118 state:resolved]" This reverts commit 4851ca9e13a4317342df02ae25b1929340523f7a. The tests do not pass for postgresql. | ||||
| * | Generate proper :counter_sql from :finder_sql when there is a newline ↵ | Patrick Joyce | 2009-06-21 | 14 | -39/+55 |
| | | | | | | | | | | | | character immediately following 'SELECT' [#2118 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Fixed a bug where create_table could not be called without a block [#2221 ↵ | Joseph Wilk | 2009-06-21 | 2 | -1/+8 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure table names are quoted while renaming for sqlite3 adapter [#2272 ↵ | Brian Hogan | 2009-06-21 | 2 | -1/+27 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Fix polymorphic_path doesn't modify options hash [#2099 state:resolved] | =?utf-8?q?Mislav=20Marohni=C4=87?= | 2009-06-21 | 2 | -5/+7 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure hm:t#create respects source associations hash conditions [#2090 ↵ | mattbauer | 2009-06-21 | 4 | -0/+16 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Add content_for?(:name) helper to check if content_for(:name) is present ↵ | Darragh Curran | 2009-06-21 | 2 | -0/+37 |
| | | | | | | | | | | | | [#1311 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Use stubbing instead of sleep() in File store cache tests | Pratik Naik | 2009-06-21 | 1 | -3/+9 |
| | | |||||
| * | Add expiry support File cache store [#1693 state:resolved] [Roman ↵ | Pratik Naik | 2009-06-21 | 4 | -7/+33 |
| | | | | | | | | Shterenzon, Pratik Naik] | ||||
| * | Minor ActionView cleanup | Yehuda Katz + Carl Lerche | 2009-06-18 | 2 | -8/+5 |
| | | |||||
| * | Fix typo | Yehuda Katz + Carl Lerche | 2009-06-18 | 1 | -1/+1 |
| | | |||||
| * | Use errors[field] instead of errors.on(field) | Jeremy Kemper | 2009-06-17 | 3 | -57/+20 |
| | | |||||
| * | Add basic JSON serializer to AMo | Joshua Peek | 2009-06-17 | 5 | -0/+112 |
| | | |||||
| * | Add simple attribute implementation backed by ivars | Joshua Peek | 2009-06-17 | 3 | -0/+48 |
| | | |||||
| * | Simplify AMo validation attribute reader | Joshua Peek | 2009-06-17 | 4 | -21/+13 |
| | | |||||
| * | Extract the layout proc into a method, and write documentation explaining ↵ | Yehuda Katz + Carl Lerche | 2009-06-17 | 2 | -9/+38 |
| | | | | | | | | what the proc does in various cases. | ||||
| * | Remove one more note about deprecated behavior | Yehuda Katz + Carl Lerche | 2009-06-17 | 1 | -3/+0 |
| | | |||||
| * | Drive the final stake through @content_for_*'s heart! | Yehuda Katz + Carl Lerche | 2009-06-17 | 8 | -36/+23 |
| | | |||||
| * | Cleaning up more tests and code that needed to work in both old and new base | Yehuda Katz + Carl Lerche | 2009-06-17 | 7 | -90/+37 |
| | | |||||
| * | Cleaning up if defined?(ActionController::Http) blocks from the pre new base ↵ | Yehuda Katz + Carl Lerche | 2009-06-17 | 7 | -90/+42 |
| | | | | | | | | era. | ||||
| * | Remove some defined?(Http) checks | Yehuda Katz + Carl Lerche | 2009-06-17 | 8 | -55/+16 |
| | | |||||
| * | Rename path.rb to resolver.rb | Yehuda Katz + Carl Lerche | 2009-06-17 | 3 | -2/+2 |
| | | |||||
| * | Rename ActionView::Template::Path ActionView::Resolver | Yehuda Katz + Carl Lerche | 2009-06-17 | 19 | -203/+165 |
| | | |||||
| * | Updated require for AMo move | Yehuda Katz + Carl Lerche | 2009-06-17 | 1 | -1/+1 |
| | | |||||
| * | Finish making pending tests pass | Yehuda Katz + Carl Lerche | 2009-06-17 | 2 | -7/+8 |
| | | |||||
| * | RJS doesn't render with an HTML layout by default | Yehuda Katz + Carl Lerche | 2009-06-17 | 2 | -5/+4 |
| | | |||||
| * | Fixing pending tests and fixed some formats / partial rendering semantics | Yehuda Katz + Carl Lerche | 2009-06-17 | 12 | -57/+74 |
| | | |||||
| * | Fix pending test about content-type | Yehuda Katz + Carl Lerche | 2009-06-17 | 1 | -5/+19 |
| | | |||||
| * | Move model naming into ActiveModel | Joshua Peek | 2009-06-17 | 15 | -13/+31 |
| | | |||||
| * | Remove a stray process2 require | Yehuda Katz + Carl Lerche | 2009-06-16 | 1 | -1/+1 |
| | | |||||
| * | Move the exceptions for missing template into Compatibility in prep for ↵ | Yehuda Katz + Carl Lerche | 2009-06-16 | 2 | -2/+7 |
| | | | | | | | | moving it into a "not-production" module | ||||
| * | An exception is raised if a layout is missing only if the layout is missing ↵ | Yehuda Katz + Carl Lerche | 2009-06-16 | 4 | -11/+5 |
| | | | | | | | | for all mimes | ||||
* | | Removed unused methods. | Emilio Tagua | 2009-06-23 | 4 | -127/+1 |
| | | |||||
* | | Arel now buils SQL queries for associations. Removed old code and | Emilio Tagua | 2009-06-23 | 4 | -72/+12 |
| | | | | | | | | updated Arel version to support this. | ||||
* | | Arel updated. All tests passing for SQLite3 and PostgreSQL. | Emilio Tagua | 2009-06-23 | 1 | -5/+5 |
| | | |||||
* | | Removed old commented code | Emilio Tagua | 2009-06-23 | 1 | -21/+0 |
| | | |||||
* | | Forget about auto scope, it's always explicit. | Emilio Tagua | 2009-06-17 | 1 | -7/+6 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-16 | 67 | -3333/+824 |
|\| | |||||
| * | Exceptions now in an exceptions module | Yehuda Katz + Carl Lerche | 2009-06-16 | 1 | -0/+58 |
| | | |||||
| * | Remove exceptions from AbstractUnit so they work in real life | Yehuda Katz + Carl Lerche | 2009-06-16 | 2 | -58/+13 |
| | | |||||
| * | Merge process2 into process to people's regular tests run :P | Yehuda Katz + Carl Lerche | 2009-06-16 | 3 | -115/+12 |
| | | |||||
| * | More _write_layout_method removal | Yehuda Katz + Carl Lerche | 2009-06-15 | 2 | -14/+0 |
| | | |||||
| * | Whoops, I guess we broke layouts ;) | Yehuda Katz + Carl Lerche | 2009-06-15 | 6 | -32/+7 |
| | | |||||
| * | rm -r controller/base! | Yehuda Katz + Carl Lerche | 2009-06-15 | 20 | -2477/+10 |
| | | |||||
| * | Get all of rake tests to pass | Yehuda Katz + Carl Lerche | 2009-06-15 | 2 | -1/+9 |
| | | |||||
| * | Get the new base tests to pass | Yehuda Katz + Carl Lerche | 2009-06-15 | 1 | -2/+1 |
| | | |||||
| * | Get the AR integration tests to pass | Yehuda Katz + Carl Lerche | 2009-06-15 | 1 | -3/+4 |
| | | |||||
| * | Keep ActionMailer using the old layouts code until it gets refactored. | Yehuda Katz + Carl Lerche | 2009-06-15 | 4 | -2/+13 |
| | |