Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into i18n-merge | Jeremy Kemper | 2008-07-17 | 106 | -296/+1950 |
|\ | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/form_options_helper.rb activerecord/lib/active_record/validations.rb | ||||
| * | Fix symbol cookie test | Pratik Naik | 2008-07-17 | 1 | -1/+1 |
| | | |||||
| * | Add extra tests to ensure Hash#slice works with an array as a key. #613 | MatthewRudy | 2008-07-17 | 2 | -0/+26 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Revert "Hash#slice supports an array of keys [#613 state:resolved]" | Pratik Naik | 2008-07-17 | 2 | -36/+21 |
| | | | | | | | | This reverts commit 396f9df8916b71f83aad8d56559cf55fc8501679. | ||||
| * | Set config.active_record.timestamped_migrations = false to have migrations ↵ | Nik Wakelin | 2008-07-17 | 4 | -1/+38 |
| | | | | | | | | | | | | with numeric prefix instead of UTC timestamp. [#446 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Revert "Run callbacks from object's metaclass" | Joshua Peek | 2008-07-16 | 3 | -35/+1 |
| | | |||||
| * | Allow deep merging of hash values for nested with_options. [#490 state:resolved] | Lawrence Pit | 2008-07-17 | 5 | -10/+63 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | All 2xx requests are considered successful [#217 state:resolved] | Joshua Peek | 2008-07-16 | 2 | -1/+3 |
| | | |||||
| * | Use fully-qualified controller name when logging. [#600 state:resolved] | Ripta Pasay | 2008-07-17 | 2 | -1/+21 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Hash#slice supports an array of keys [#613 state:resolved] | Josh Owens | 2008-07-16 | 2 | -21/+36 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | MemCacheStore#decrement should use data instance variable not local variable ↵ | Joshua Peek | 2008-07-16 | 1 | -15/+15 |
| | | | | | | | | [#521 state:resolved] | ||||
| * | 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 | ||||
| * | | Fixed that AssetTagHelper#compute_public_path shouldn't cache the asset_host ↵ | David Heinemeier Hansson | 2008-07-16 | 2 | -11/+16 |
| | | | | | | | | | | | | along with the source or per-request proc's won't run [DHH] | ||||
* | | | moving country helpers from form_options_helper to form_country_helper again | Sven Fuchs | 2008-07-16 | 4 | -1620/+791 |
| | | | |||||
* | | | fixing another timezone dependent test | Sven Fuchs | 2008-07-16 | 2 | -26/+6 |
| | | | |||||
* | | | make i18n date/time tests timezone independent | Sven Fuchs | 2008-07-16 | 1 | -10/+10 |
| | | | |||||
* | | | missed to remove a call to to_s while resolving conflicts in validations.rb | Sven Fuchs | 2008-07-16 | 1 | -1/+1 |
| | | | |||||
* | | | add i18n lib files | Sven Fuchs | 2008-07-16 | 10 | -0/+1064 |
| | | | |||||
* | | | remove i18n lib subproject | Sven Fuchs | 2008-07-16 | 1 | -0/+0 |
| | | | |||||
* | | | merge forward to current rails/master | Sven Fuchs | 2008-07-16 | 247 | -3276/+7500 |
|\ \ \ | | |/ | |/| | |||||
| * | | 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] |