aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'rails/master'Emilio Tagua2009-06-3034-1107/+2336
|\
| * Make sure the wrapped exceptions also have the original exception available.Michael Koziarski2009-06-264-7/+18
| * Translate foreign key violations to ActiveRecord::InvalidForeignKey exceptions.Michael Schuerig2009-06-264-0/+16
| * Translate adapter errors that indicate a violated uniqueness constraint to Ac...Michael Schuerig2009-06-266-1/+47
| * Handle missing javascript/stylesheets assets by raising an exceptionChristos Zisopoulos2009-06-266-34/+120
| * Try speeding up rails bootingYehuda Katz + Carl Lerche2009-06-255-11/+19
| * Run the block passed to #run first when initializingYehuda Katz + Carl Lerche2009-06-251-0/+1
| * ignore absolute tmp directoryJoshua Peek2009-06-251-0/+1
| * send_data should set Content-Length as a stringJoshua Peek2009-06-252-2/+2
| * Remove deprecated implicit ivar assignmentJoshua Peek2009-06-252-33/+0
| * Missed file from the previous commit 92b229e1251d7d3578c3f73e8185972354e76436Pratik Naik2009-06-251-0/+15
| * Make performance tests work againPratik Naik2009-06-252-16/+1
| * Separate Rails module methods, the config object, and the initializer into se...Yehuda Katz + Carl Lerche2009-06-233-334/+338
| * Resurrect threadsafe!Yehuda Katz + Carl Lerche2009-06-231-0/+12
| * Tests pass, AWDoR passes, and a fresh app boots.Yehuda Katz + Carl Lerche2009-06-231-121/+228
| * Got all the railties tests to pass, rails must boot!Yehuda Katz + Carl Lerche2009-06-234-3/+34
| * Fix the default frameworksYehuda Katz + Carl Lerche2009-06-232-2/+11
| * Get more tests to passYehuda Katz + Carl Lerche2009-06-232-5/+76
| * Get initializer_test.rb to pass with the new initializer.Yehuda Katz + Carl Lerche2009-06-233-18/+114
| * Started making progress on implementing a new initializer.Yehuda Katz + Carl Lerche2009-06-234-1075/+1725
| * Initial initializer implYehuda Katz + Carl Lerche2009-06-231-11/+6
| * Starting to write the new initializerYehuda Katz + Carl Lerche2009-06-231-0/+118
* | Merge commit 'rails/master'Emilio Tagua2009-06-241-3/+3
|\|
| * Passes in 1.9Yehuda Katz + Carl Lerche2009-06-231-3/+3
* | Updated Arel submodule.Emilio Tagua2009-06-231-6/+5
* | Refactoring: Calculations now use construct_finder_sql instead they own method.Emilio Tagua2009-06-232-25/+8
* | 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 newline...Yehuda Katz + Carl Lerche2009-06-2214-55/+39
| * Generate proper :counter_sql from :finder_sql when there is a newline charact...Patrick Joyce2009-06-2114-39/+55
| * Fixed a bug where create_table could not be called without a block [#2221 sta...Joseph Wilk2009-06-212-1/+8
| * Ensure table names are quoted while renaming for sqlite3 adapter [#2272 state...Brian Hogan2009-06-212-1/+27
| * Fix polymorphic_path doesn't modify options hash [#2099 state:resolved]=?utf-8?q?Mislav=20Marohni=C4=87?=2009-06-212-5/+7
| * Ensure hm:t#create respects source associations hash conditions [#2090 state:...mattbauer2009-06-214-0/+16
| * Add content_for?(:name) helper to check if content_for(:name) is present [#13...Darragh Curran2009-06-212-0/+37
| * 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 Shterenzon,...Pratik Naik2009-06-214-7/+33
| * 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 wha...Yehuda Katz + Carl Lerche2009-06-172-9/+38
| * 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
| * 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