aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'rails/master'Emilio Tagua2009-07-0127-53/+85
|\
| * Fix pattern to match various magic comment formatsAkira Matsuda2009-07-011-1/+1
| * JSON.escape returns UTF-8 stringsJeremy Kemper2009-07-012-7/+14
| * uses Hash#except/sliceJeremy Kemper2009-07-011-0/+2
| * Forgot to commit the new file. This is slightly embarrassing.Yehuda Katz + Carl Lerche2009-07-011-0/+2
| * Apparently stdlib isn't std enoughYehuda Katz + Carl Lerche2009-07-011-4/+6
| * Modify isolation test to require a file not in use anywhere in RailsYehuda Katz + Carl Lerche2009-07-011-4/+4
| * Updates CI to use latest mochaYehuda Katz + Carl Lerche2009-07-011-1/+1
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-07-01120-1254/+3270
| |\
| | * Original cache objects should not be immutable [#2860 state:resolved]Yehuda Katz + Carl Lerche2009-07-012-1/+7
| | * Added AR:B#dup method for duplicationg object without frozen attributes [#285...Yehuda Katz + Carl Lerche2009-07-012-0/+11
| | * ensure Inflector.camelize works with symbols [#2856 state:resolved]Yehuda Katz + Carl Lerche2009-07-013-1/+14
| | * Move mocha down below initial T::U require and bump version to 0.9.7 [#2858 s...Yehuda Katz + Carl Lerche2009-07-0111-31/+10
| * | Turn on autolist for debugging alsoJeremy Kemper2009-06-181-1/+4
| * | Friendlier runtime exception if delegatee is nilJeremy Kemper2009-06-182-4/+10
| * | Delegated methods report the expected file/line in backtracesJeremy Kemper2009-06-181-2/+3
* | | Create is now powered by Arel. Removed methods that are no longer used.Emilio Tagua2009-07-014-23/+24
* | | Small refactor to update_all.Emilio Tagua2009-07-011-3/+3
* | | Merge commit 'rails/master'Emilio Tagua2009-07-015-11/+85
|\ \ \ | | |/ | |/|
| * | Accept Symbol for contoller name [#2855 state:resolved]Yehuda Katz + Carl Lerche2009-07-012-1/+12
| * | Crazy hacks to get the Isolation testing module to work on non forking enviro...Yehuda Katz + Carl Lerche2009-06-303-10/+73
* | | Merge commit 'rails/master'Emilio Tagua2009-06-3014-39/+57
|\| |
| * | Revert "Revert "Generate proper :counter_sql from :finder_sql when there is a...Pratik Naik2009-07-0114-39/+57
* | | Merge commit 'rails/master'Emilio Tagua2009-06-3043-77/+646
|\| |
| * | Bump up the version to 3.0.preCarl Lerche2009-06-3011-27/+27
| * | Add #concat to Rails::Application::PathCarl Lerche2009-06-303-1/+12
| * | Test that builtin_directories is only used in development modeCarl Lerche2009-06-301-0/+17
| * | Created AS::Testing::Isolation which runs each test case in a separate process.Yehuda Katz + Carl Lerche2009-06-303-0/+181
| * | Require core_ext/kernel/requires in test_help to providing #require_library_o...Carl Lerche2009-06-301-0/+1
| * | Stop the initializer from blowing up when builtin_directories is emptyCarl Lerche2009-06-301-1/+1
| * | Remove stray checks for Rspec in the testing setup.Carl Lerche2009-06-302-8/+0
| * | Changed ActiveRecord::Base.human_name to underscore the class name before it ...Justin French2009-06-302-4/+10
| * | Make text_area_tag escape contents by default.Chris Mear2009-06-272-0/+17
| * | Make filter_parameters work correctly with array parameters.Vicente Mundim2009-06-272-1/+6
| * | Starting to replace scattered path configuration settings with the path objectYehuda Katz + Carl Lerche2009-06-2620-31/+186
| * | Finished a first stab at the Rails application path object.Yehuda Katz + Carl Lerche2009-06-262-64/+125
| * | Update paths to support an explicit root and multiple paths per categoryYehuda Katz + Carl Lerche2009-06-261-29/+91
| * | Simple initial Paths implYehuda Katz + Carl Lerche2009-06-261-0/+68
| * | Checkpoint. Added a bunch of TODOs and some changes after further going throu...Yehuda Katz + Carl Lerche2009-06-261-15/+8
* | | 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