Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Made the location of the routes file configurable with ↵ | David Heinemeier Hansson | 2008-05-01 | 4 | -6/+28 |
| | | | | config.routes_configuration_file (Scott Fleckenstein) [#88 state:resolved] | ||||
* | Fix failing associate_with_create tests inserting null first_name | Jeremy Kemper | 2008-05-01 | 1 | -3/+3 |
| | |||||
* | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-05-01 | 3 | -15/+24 |
|\ | |||||
| * | Ruby 1.9 compat: compatibility wrapper for new Module#const_defined? behavior | Jeremy Kemper | 2008-05-01 | 2 | -13/+18 |
| | | |||||
| * | Prevent AssetTagHelper from crashing if RAILS_ROOT is not defined. Fixes ↵ | Hongli Lai (Phusion | 2008-05-01 | 1 | -2/+6 |
| | | | | | | | | | | | | compatibility with Passenger. [#84 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | Added missing files | David Heinemeier Hansson | 2008-05-01 | 3 | -0/+18 |
|/ | |||||
* | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-05-01 | 18 | -88/+228 |
|\ | |||||
| * | Fixed render :template for templates in top level of view path. [#54 ↵ | Pratik Naik | 2008-05-01 | 4 | -3/+30 |
| | | | | | | | | state:resolved] | ||||
| * | Fixed AssociationsPreload such that it doesnt require foreign keys to be ↵ | David Heinemeier Hansson | 2008-04-30 | 4 | -12/+44 |
| | | | | | | | | integers (fcheung) [#33 state:resolved] | ||||
| * | Cheaper Dependencies#log_call to resolve irritating error message w/ rake ↵ | David Heinemeier Hansson | 2008-04-30 | 1 | -4/+6 |
| | | | | | | | | db:create (Sven) [#56 state:resolved] | ||||
| * | Added block-setting of attributes for Base.create like Base.new already has ↵ | David Heinemeier Hansson | 2008-04-30 | 5 | -4/+56 |
| | | | | | | | | (Adam Meehan) [#39 state:resolved] | ||||
| * | Fixed labels that have a bracketed name and an index [#68 state:resolved] | Kevin Glowacz | 2008-04-30 | 2 | -0/+13 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | FormHelper#label_tag accepts :for option [encoded] [#38 state:resolved] | Joshua Peek | 2008-04-30 | 2 | -62/+72 |
| | | |||||
| * | Fixed fixture caching with prefixed or suffixed tables. | Rhett Sutphin | 2008-04-30 | 2 | -3/+7 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | | best solution? | Steven Soroka | 2008-05-01 | 2 | -2/+14 |
|/ | | | | Signed-off-by: Steven Soroka <ssoroka78@gmail.com> | ||||
* | Fixed that pessimistic locking you reference the quoted table name (Josh ↵ | David Heinemeier Hansson | 2008-04-30 | 4 | -2/+12 |
| | | | | Susser) [#67 state:resolved] | ||||
* | Forgot these | David Heinemeier Hansson | 2008-04-30 | 3 | -0/+8 |
| | |||||
* | Fixed tests (and the weird assumption that no logger would mean that the ↵ | David Heinemeier Hansson | 2008-04-30 | 2 | -20/+8 |
| | | | | code wasnt run) | ||||
* | Added test for has_one partial rendering (keeran) [#43 state:resolved] | David Heinemeier Hansson | 2008-04-30 | 3 | -1/+20 |
| | |||||
* | Fixed render :partial => @collection.named_scope (nkallen) [#61 state:resolved] | David Heinemeier Hansson | 2008-04-30 | 3 | -11/+9 |
| | |||||
* | Ensure postgresql tests work when starting from scratch. | Frederick Cheung | 2008-04-30 | 2 | -3/+1 |
| | |||||
* | Change tests against all scope to base scope as all is now used as a finder ↵ | David Heinemeier Hansson | 2008-04-30 | 3 | -14/+17 |
| | | | | alias | ||||
* | Fixed tabs to spaces [#47 state:resolved] | David Heinemeier Hansson | 2008-04-29 | 2 | -4/+4 |
| | |||||
* | Fixed response logging to use length instead of the entire thing (seangeo) ↵ | David Heinemeier Hansson | 2008-04-29 | 2 | -1/+3 |
| | | | | [#27 state:resolved] | ||||
* | Fixed that change_column should be able to use :null => true on a field that ↵ | David Heinemeier Hansson | 2008-04-29 | 2 | -1/+10 |
| | | | | formerly had false [Nate Wiger] [#26 state:resolved] | ||||
* | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-04-29 | 7 | -16/+60 |
|\ | |||||
| * | Add missing clear method to memory_store | Tobias Lütke | 2008-04-29 | 1 | -0/+4 |
| | | |||||
| * | Allow access to mem_cache_store's stats hash | Tobias Lütke | 2008-04-29 | 1 | -0/+4 |
| | | |||||
| * | Implement increment/decrement on cache storage engines, using read/write by ↵ | Tobias Lütke | 2008-04-29 | 3 | -3/+37 |
| | | | | | | | | default and using atomic command on memcache | ||||
| * | By default rails will update keys in memcached when using Rails.cache.write. ↵ | Tobias Lütke | 2008-04-29 | 1 | -6/+5 |
| | | | | | | | | Use :unless_exist => true flag to prevent existing keys from being overwritten. | ||||
| * | Clarify confusing ActionController::Base.allow_concurrency flag. | Jeremy Kemper | 2008-04-28 | 1 | -3/+4 |
| | | |||||
| * | Note that allow_concurrency = true means you need to ↵ | Jeremy Kemper | 2008-04-28 | 1 | -1/+3 |
| | | | | | | | | verify_active_connections! to clear out connections assigned to stale threads. | ||||
| * | run prepare callbacks after after_initialize blocks so config.to_prepare ↵ | Jeremy Kemper | 2008-04-28 | 1 | -3/+3 |
| | | | | | | | | actually works | ||||
* | | Default integer need not specify a limit [#20371 state:resolved] (matthuhiggins) | David Heinemeier Hansson | 2008-04-29 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-04-28 | 2 | -5/+15 |
|\ | |||||
| * | Ruby 1.9 compat: force assert_select text encoding to the encoding of the ↵ | Jeremy Kemper | 2008-04-28 | 2 | -5/+15 |
| | | | | | | | | regexp it's matching against. | ||||
| * | Revert alias_method_chain exceptions as they broke aliasing class methods. | Michael Koziarski | 2008-04-28 | 2 | -18/+1 |
| | | | | | | | | This reverts commit be48cad9a41ebf88ae19f2381a57917d532734c9. | ||||
| * | Make alias_method_chain complain about duplicate aliases. Previously | John Barnette | 2008-04-28 | 2 | -1/+18 |
| | | | | | | | | | | | | repeated calls to alias_method_chain would cause infinite loops. Signed-Off-By: Michael Koziarski <michael@koziarski.com> | ||||
* | | Let Base.all use conditions etc like first/last | David Heinemeier Hansson | 2008-04-28 | 3 | -1/+10 |
|/ | |||||
* | Fixed that BenchmarkHelper should use controller.logger instead of @logger ↵ | David Heinemeier Hansson | 2008-04-27 | 1 | -3/+5 |
| | | | | (which now apparently is gone) | ||||
* | Added ActionController::TestCase#rescue_action_in_public! to control whether ↵ | David Heinemeier Hansson | 2008-04-27 | 2 | -2/+23 |
| | | | | the action under test should use the regular rescue_action path instead of simply raising the exception inline (great for error testing) [DHH] | ||||
* | Merge branch 'master' of git@github.com:rails/rails | David Heinemeier Hansson | 2008-04-27 | 11 | -13/+90 |
|\ | |||||
| * | Be friendlier when upgrading apps with an old boot.rb. | John Barnette | 2008-04-28 | 1 | -0/+4 |
| | | | | | | | | | | | | | | If Rails doesn't respond to vendor_rails?, abort with an error asking the user to run 'rake rails:update'. Signed-Off-By: Michael Koziarski <michael@koziarski.com> | ||||
| * | Remove old :limit removal code from find_initial, logic is now handled in ↵ | Aliaksey Kandratsenka | 2008-04-27 | 1 | -1/+1 |
| | | | | | | | | | | | | the preloading and eager loading code. Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Add default options to file_store to make it align with the other cache ↵ | Michael Koziarski | 2008-04-26 | 1 | -2/+2 |
| | | | | | | | | | | | | stores. [monki] [#40 state:resolved] | ||||
| * | Ensure table names are quoted by the association preloading code. | Frederick Cheung | 2008-04-26 | 8 | -10/+83 |
| | | | | | | | | | | | | [#45 state:resolved] Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | | Changing "and" to && whereever I catch it | David Heinemeier Hansson | 2008-04-27 | 1 | -1/+1 |
|/ | |||||
* | Added that the MySQL adapter should map integer to either smallint, int, or ↵ | David Heinemeier Hansson | 2008-04-25 | 2 | -0/+18 |
| | | | | bigint depending on the :limit just like PostgreSQL [DHH] | ||||
* | Pass template object to Handler#compile | Pratik Naik | 2008-04-24 | 4 | -4/+4 |
| | |||||
* | Use .gitignore as the convention for dummy file names. | Joshua Peek | 2008-04-24 | 6 | -0/+0 |
| |