Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Resolved conflict | David Heinemeier Hansson | 2008-07-16 | 217 | -1968/+5058 |
|\ | |||||
| * | Allow Dispatcher exceptions to be handled in application.rb using rescue_from | Pratik Naik | 2008-07-16 | 2 | -12/+25 |
| | | |||||
| * | Fixed template recompile logic [#630 state:resolved] | Stefan Kaes | 2008-07-16 | 3 | -22/+73 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Merge with docrails. | Pratik Naik | 2008-07-16 | 70 | -176/+1408 |
| | | |||||
| * | Add some useful comments to rackup config | Joshua Peek | 2008-07-15 | 1 | -0/+14 |
| | | |||||
| * | Add config.ru to rails app generator | Pratik Naik | 2008-07-16 | 2 | -0/+4 |
| | | |||||
| * | Improve rack/cgi tests | Pratik Naik | 2008-07-16 | 2 | -12/+6 |
| | | |||||
| * | Make RackRequest#request_method respect _method | Pratik Naik | 2008-07-16 | 3 | -4/+66 |
| | | |||||
| * | ActionMailer and ActionView can share the same view path cache | Joshua Peek | 2008-07-15 | 1 | -2/+4 |
| | | |||||
| * | Removed config.action_view.cache_template_loading, use config.cache_classes ↵ | Joshua Peek | 2008-07-15 | 8 | -11/+20 |
| | | | | | | | | instead | ||||
| * | RackResponse should not contain Status header | Pratik Naik | 2008-07-16 | 2 | -4/+14 |
| | | |||||
| * | Tests for rack response content type | Pratik Naik | 2008-07-16 | 1 | -0/+21 |
| | | |||||
| * | Run callbacks from object's metaclass [#575 state:resolved] | Joshua Peek | 2008-07-15 | 3 | -1/+35 |
| | | |||||
| * | Added Object#metaclass | Joshua Peek | 2008-07-15 | 3 | -0/+17 |
| | | |||||
| * | Add tests for CgiRequest#content_type | Pratik Naik | 2008-07-16 | 1 | -0/+12 |
| | | |||||
| * | RackRequest#content_type should return Mime::Type | Pratik Naik | 2008-07-16 | 2 | -1/+13 |
| | | |||||
| * | Improved test coverage for fragment cache helper | Joshua Peek | 2008-07-15 | 4 | -13/+63 |
| | | |||||
| * | JavaScriptGenerator should only sets output_buffer for the duration of the ↵ | Jeremy Kemper | 2008-07-15 | 4 | -12/+22 |
| | | | | | | | | update block | ||||
| * | Observers not longer add an after_find method to the observed class. | Stefan Kaes | 2008-07-15 | 2 | -7/+14 |
| | | | | | | | | [#625 state:resolved] | ||||
| * | requiring rubygems version 1.1.1 | David Lowenfels | 2008-07-15 | 1 | -4/+4 |
| | | |||||
| * | update_counters should update nil values. | miloops | 2008-07-15 | 3 | -3/+21 |
| | | | | | | | | | | | | This allows counter columns with default null instead of requiring default 0. [#493 state:resolved] | ||||
| * | Give more info on missing gems and abort instead of printing a warning. App ↵ | Jeremy Kemper | 2008-07-15 | 1 | -5/+10 |
| | | | | | | | | can begin in incomplete state otherwise. | ||||
| * | Move performance test helper settings to railties | Pratik Naik | 2008-07-15 | 2 | -6/+7 |
| | | |||||
| * | Get buffer for fragment cache from template's @output_buffer | Joshua Peek | 2008-07-15 | 11 | -260/+198 |
| | | |||||
| * | Move the transaction counter to the connection object rather than ↵ | Jonathan Viney | 2008-07-15 | 5 | -21/+48 |
| | | | | | | | | | | | | | | maintaining it on the current Thread. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#533 state:resolved] | ||||
| * | Try to get more useful errors out of the test_line_offset failures | Michael Koziarski | 2008-07-15 | 1 | -10/+10 |
| | | |||||
| * | Ruby 1.9 compat: only eval with block.binding in 1.9, uses more memory than ↵ | Jeremy Kemper | 2008-07-15 | 1 | -6/+12 |
| | | | | | | | | eval with block | ||||
| * | Ruby 1.9 compat: account for different String#hash | Jeremy Kemper | 2008-07-15 | 1 | -1/+2 |
| | | |||||
| * | Ruby 1.9 compat: call Proc#binding explicitly. [#623 state:resolved] | 松田 明 | 2008-07-15 | 1 | -1/+1 |
| | | |||||
| * | Add in_groups to ActiveSupport::CoreExtensions::Array::Grouping. [#579 ↵ | Adrian Mugnolo | 2008-07-15 | 3 | -6/+97 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | SQLite: rename_column raises if the column doesn't exist. | Tarmo Tänav | 2008-07-14 | 1 | -0/+3 |
| | | | | | | | | [#622 state:resolved] | ||||
| * | Fixed postgresql limited eager loading for the case where scoped :order was ↵ | Tarmo Tänav | 2008-07-14 | 1 | -3/+8 |
| | | | | | | | | present | ||||
| * | Fix TimeWithZone unmarshaling: coerce unmarshaled Time instances to utc, ↵ | gbuesing | 2008-07-14 | 3 | -1/+9 |
| | | | | | | | | because Ruby's marshaling of Time instances doesn't respect the zone | ||||
| * | Append a "_" to memoized instance variables | Joshua Peek | 2008-07-14 | 1 | -3/+4 |
| | | |||||
| * | Some performance tweaks to ActiveSupport::Memoizable | Tarmo Tänav | 2008-07-14 | 2 | -2/+8 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | memorize typo | Joshua Peek | 2008-07-14 | 5 | -15/+15 |
| | | |||||
| * | Include Memoizable in ActionView::Template | Joshua Peek | 2008-07-14 | 3 | -43/+27 |
| | | |||||
| * | Added Memoizable mixin for caching simple lazy loaded attributes | Joshua Peek | 2008-07-14 | 4 | -0/+80 |
| | | |||||
| * | Use sub instead of gsub | Tarmo Tänav | 2008-07-14 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Eager load Partial variable_name and counter_name. Tidy up ↵ | Joshua Peek | 2008-07-14 | 4 | -45/+49 |
| | | | | | | | | render_partial_collection. | ||||
| * | Fix integer quoting issues in association preload. [#602 state:resolved] | Tiago Macedo | 2008-07-14 | 2 | -3/+19 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Add assert_sql helper method to check for specific SQL output in Active ↵ | Gabe da Silveira | 2008-07-14 | 2 | -7/+18 |
| | | | | | | | | | | | | Record test suite. [#325 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Move dead recompile_template? also | Jeremy Kemper | 2008-07-14 | 2 | -17/+2 |
| | | |||||
| * | Remove dead code from merge | Jeremy Kemper | 2008-07-14 | 1 | -30/+0 |
| | | |||||
| * | Fixed mysql change_column_default to not make the column always nullable. | Tarmo Tänav | 2008-07-14 | 4 | -7/+86 |
| | | | | | | | | | | | | Also added change_column_null to both mysql and sqlite to keep the api features closer to postgresql. [#617 state:resolved] | ||||
| * | Fixed test_rename_nonexistent_column for PostgreSQL | Tarmo Tänav | 2008-07-14 | 1 | -1/+7 |
| | | | | | | | | | | | | Also fixed ability to run migration_test.rb alone [#616 state:resolved] | ||||
| * | PostgreSQL: don't dump :limit => 4 for integers | Jeremy Kemper | 2008-07-14 | 1 | -1/+0 |
| | | |||||
| * | Fix bad merge | Jeremy Kemper | 2008-07-14 | 1 | -2/+2 |
| | | |||||
| * | Faster and clearer value_to_boolean | Jeremy Kemper | 2008-07-14 | 1 | -5/+4 |
| | | |||||
| * | Cache Module#parent_name | Jeremy Kemper | 2008-07-14 | 1 | -6/+17 |
| | |