aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'rails/master'Emilio Tagua2009-06-23100-698/+813
|\
| * Small changes to get 1.9 passing (for the most part)Yehuda Katz2009-06-232-2/+2
| |
| * Revert "Generate proper :counter_sql from :finder_sql when there is a ↵Yehuda Katz + Carl Lerche2009-06-2214-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 Joyce2009-06-2114-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 Wilk2009-06-212-1/+8
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure table names are quoted while renaming for sqlite3 adapter [#2272 ↵Brian Hogan2009-06-212-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-212-5/+7
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ensure hm:t#create respects source associations hash conditions [#2090 ↵mattbauer2009-06-214-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 Curran2009-06-212-0/+37
| | | | | | | | | | | | [#1311 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Use stubbing instead of sleep() in File store cache testsPratik Naik2009-06-211-3/+9
| |
| * Add expiry support File cache store [#1693 state:resolved] [Roman ↵Pratik Naik2009-06-214-7/+33
| | | | | | | | Shterenzon, Pratik Naik]
| * Minor ActionView cleanupYehuda Katz + Carl Lerche2009-06-182-8/+5
| |
| * Fix typoYehuda Katz + Carl Lerche2009-06-181-1/+1
| |
| * Use errors[field] instead of errors.on(field)Jeremy Kemper2009-06-173-57/+20
| |
| * Add basic JSON serializer to AMoJoshua Peek2009-06-175-0/+112
| |
| * Add simple attribute implementation backed by ivarsJoshua Peek2009-06-173-0/+48
| |
| * Simplify AMo validation attribute readerJoshua Peek2009-06-174-21/+13
| |
| * Extract the layout proc into a method, and write documentation explaining ↵Yehuda Katz + Carl Lerche2009-06-172-9/+38
| | | | | | | | what the proc does in various cases.
| * Remove one more note about deprecated behaviorYehuda Katz + Carl Lerche2009-06-171-3/+0
| |
| * Drive the final stake through @content_for_*'s heart!Yehuda Katz + Carl Lerche2009-06-178-36/+23
| |
| * Cleaning up more tests and code that needed to work in both old and new baseYehuda Katz + Carl Lerche2009-06-177-90/+37
| |
| * Cleaning up if defined?(ActionController::Http) blocks from the pre new base ↵Yehuda Katz + Carl Lerche2009-06-177-90/+42
| | | | | | | | era.
| * Remove some defined?(Http) checksYehuda Katz + Carl Lerche2009-06-178-55/+16
| |
| * Rename path.rb to resolver.rbYehuda Katz + Carl Lerche2009-06-173-2/+2
| |
| * Rename ActionView::Template::Path ActionView::ResolverYehuda Katz + Carl Lerche2009-06-1719-203/+165
| |
| * Updated require for AMo moveYehuda Katz + Carl Lerche2009-06-171-1/+1
| |
| * Finish making pending tests passYehuda Katz + Carl Lerche2009-06-172-7/+8
| |
| * RJS doesn't render with an HTML layout by defaultYehuda Katz + Carl Lerche2009-06-172-5/+4
| |
| * Fixing pending tests and fixed some formats / partial rendering semanticsYehuda Katz + Carl Lerche2009-06-1712-57/+74
| |
| * Fix pending test about content-typeYehuda Katz + Carl Lerche2009-06-171-5/+19
| |
| * Move model naming into ActiveModelJoshua Peek2009-06-1715-13/+31
| |
| * Remove a stray process2 requireYehuda Katz + Carl Lerche2009-06-161-1/+1
| |
| * Move the exceptions for missing template into Compatibility in prep for ↵Yehuda Katz + Carl Lerche2009-06-162-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 Lerche2009-06-164-11/+5
| | | | | | | | for all mimes
* | Removed unused methods.Emilio Tagua2009-06-234-127/+1
| |
* | Arel now buils SQL queries for associations. Removed old code andEmilio Tagua2009-06-234-72/+12
| | | | | | | | updated Arel version to support this.
* | Arel updated. All tests passing for SQLite3 and PostgreSQL.Emilio Tagua2009-06-231-5/+5
| |
* | Removed old commented codeEmilio Tagua2009-06-231-21/+0
| |
* | Forget about auto scope, it's always explicit.Emilio Tagua2009-06-171-7/+6
| |
* | Merge commit 'rails/master'Emilio Tagua2009-06-1667-3333/+824
|\|
| * Exceptions now in an exceptions moduleYehuda Katz + Carl Lerche2009-06-161-0/+58
| |
| * Remove exceptions from AbstractUnit so they work in real lifeYehuda Katz + Carl Lerche2009-06-162-58/+13
| |
| * Merge process2 into process to people's regular tests run :PYehuda Katz + Carl Lerche2009-06-163-115/+12
| |
| * More _write_layout_method removalYehuda Katz + Carl Lerche2009-06-152-14/+0
| |
| * Whoops, I guess we broke layouts ;)Yehuda Katz + Carl Lerche2009-06-156-32/+7
| |
| * rm -r controller/base!Yehuda Katz + Carl Lerche2009-06-1520-2477/+10
| |
| * Get all of rake tests to passYehuda Katz + Carl Lerche2009-06-152-1/+9
| |
| * Get the new base tests to passYehuda Katz + Carl Lerche2009-06-151-2/+1
| |
| * Get the AR integration tests to passYehuda Katz + Carl Lerche2009-06-151-3/+4
| |
| * Keep ActionMailer using the old layouts code until it gets refactored.Yehuda Katz + Carl Lerche2009-06-154-2/+13
| |