Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'rails/master' | Emilio Tagua | 2009-06-30 | 34 | -1107/+2336 |
|\ | | | | | | | | | Conflicts: activerecord/test/cases/adapter_test.rb | ||||
| * | Make sure the wrapped exceptions also have the original exception available. | Michael Koziarski | 2009-06-26 | 4 | -7/+18 |
| | | | | | | | | [#2419 state:committed] | ||||
| * | Translate foreign key violations to ActiveRecord::InvalidForeignKey exceptions. | Michael Schuerig | 2009-06-26 | 4 | -0/+16 |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Translate adapter errors that indicate a violated uniqueness constraint to ↵ | Michael Schuerig | 2009-06-26 | 6 | -1/+47 |
| | | | | | | | | | | | | ActiveRecord::RecordNotUnique exception derived from ActiveReecord::StatementInvalid. Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Handle missing javascript/stylesheets assets by raising an exception | Christos Zisopoulos | 2009-06-26 | 6 | -34/+120 |
| | | | | | | | | | | | | | | | | | | | | | | | | An exception will be raised if a local javascript/stylesheet file included by the stylesheet_link_tag or javascript_include_tag can not be found. When caching is enabled, we use atomic_write to ensure that the cache file is not created with zero length. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2738 state:committed] | ||||
| * | Try speeding up rails booting | Yehuda Katz + Carl Lerche | 2009-06-25 | 5 | -11/+19 |
| | | |||||
| * | Run the block passed to #run first when initializing | Yehuda Katz + Carl Lerche | 2009-06-25 | 1 | -0/+1 |
| | | |||||
| * | ignore absolute tmp directory | Joshua Peek | 2009-06-25 | 1 | -0/+1 |
| | | |||||
| * | send_data should set Content-Length as a string | Joshua Peek | 2009-06-25 | 2 | -2/+2 |
| | | |||||
| * | Remove deprecated implicit ivar assignment | Joshua Peek | 2009-06-25 | 2 | -33/+0 |
| | | |||||
| * | Missed file from the previous commit 92b229e1251d7d3578c3f73e8185972354e76436 | Pratik Naik | 2009-06-25 | 1 | -0/+15 |
| | | |||||
| * | Make performance tests work again | Pratik Naik | 2009-06-25 | 2 | -16/+1 |
| | | |||||
| * | Separate Rails module methods, the config object, and the initializer into ↵ | Yehuda Katz + Carl Lerche | 2009-06-23 | 3 | -334/+338 |
| | | | | | | | | separate files. | ||||
| * | Resurrect threadsafe! | Yehuda Katz + Carl Lerche | 2009-06-23 | 1 | -0/+12 |
| | | |||||
| * | Tests pass, AWDoR passes, and a fresh app boots. | Yehuda Katz + Carl Lerche | 2009-06-23 | 1 | -121/+228 |
| | | |||||
| * | Got all the railties tests to pass, rails must boot! | Yehuda Katz + Carl Lerche | 2009-06-23 | 4 | -3/+34 |
| | | |||||
| * | Fix the default frameworks | Yehuda Katz + Carl Lerche | 2009-06-23 | 2 | -2/+11 |
| | | |||||
| * | Get more tests to pass | Yehuda Katz + Carl Lerche | 2009-06-23 | 2 | -5/+76 |
| | | |||||
| * | Get initializer_test.rb to pass with the new initializer. | Yehuda Katz + Carl Lerche | 2009-06-23 | 3 | -18/+114 |
| | | |||||
| * | Started making progress on implementing a new initializer. | Yehuda Katz + Carl Lerche | 2009-06-23 | 4 | -1075/+1725 |
| | | | | | | | | | | Class.any_instance.expects(:require).raises(LoadError) ... w0t | ||||
| * | Initial initializer impl | Yehuda Katz + Carl Lerche | 2009-06-23 | 1 | -11/+6 |
| | | |||||
| * | Starting to write the new initializer | Yehuda Katz + Carl Lerche | 2009-06-23 | 1 | -0/+118 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-24 | 1 | -3/+3 |
|\| | |||||
| * | Passes in 1.9 | Yehuda Katz + Carl Lerche | 2009-06-23 | 1 | -3/+3 |
| | | |||||
* | | Updated Arel submodule. | Emilio Tagua | 2009-06-23 | 1 | -6/+5 |
| | | |||||
* | | Refactoring: Calculations now use construct_finder_sql instead they own method. | Emilio Tagua | 2009-06-23 | 2 | -25/+8 |
| | | |||||
* | | 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 |
| | |