aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed that TextHelper#text_field would corrypt when raw HTML was used as the ↵David Heinemeier Hansson2008-05-013-0/+19
| | | | value (mchenryc, Kevin Glowacz) [#80 state:resolved]
* Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-05-013-7/+17
|\
| * Accept header mime parser can now deal with empty fieldsTobias Lütke2008-05-012-3/+13
| |
| * Ruby 1.9 compat: don't shadow local with block varJeremy Kemper2008-05-011-4/+4
| |
* | Made the location of the routes file configurable with ↵David Heinemeier Hansson2008-05-014-6/+28
|/ | | | config.routes_configuration_file (Scott Fleckenstein) [#88 state:resolved]
* Fix failing associate_with_create tests inserting null first_nameJeremy Kemper2008-05-011-3/+3
|
* Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-05-013-15/+24
|\
| * Ruby 1.9 compat: compatibility wrapper for new Module#const_defined? behaviorJeremy Kemper2008-05-012-13/+18
| |
| * Prevent AssetTagHelper from crashing if RAILS_ROOT is not defined. Fixes ↵Hongli Lai (Phusion2008-05-011-2/+6
| | | | | | | | | | | | compatibility with Passenger. [#84 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | Added missing filesDavid Heinemeier Hansson2008-05-013-0/+18
|/
* Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-05-0118-88/+228
|\
| * Fixed render :template for templates in top level of view path. [#54 ↵Pratik Naik2008-05-014-3/+30
| | | | | | | | state:resolved]
| * Fixed AssociationsPreload such that it doesnt require foreign keys to be ↵David Heinemeier Hansson2008-04-304-12/+44
| | | | | | | | integers (fcheung) [#33 state:resolved]
| * Cheaper Dependencies#log_call to resolve irritating error message w/ rake ↵David Heinemeier Hansson2008-04-301-4/+6
| | | | | | | | db:create (Sven) [#56 state:resolved]
| * Added block-setting of attributes for Base.create like Base.new already has ↵David Heinemeier Hansson2008-04-305-4/+56
| | | | | | | | (Adam Meehan) [#39 state:resolved]
| * Fixed labels that have a bracketed name and an index [#68 state:resolved]Kevin Glowacz2008-04-302-0/+13
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * FormHelper#label_tag accepts :for option [encoded] [#38 state:resolved]Joshua Peek2008-04-302-62/+72
| |
| * Fixed fixture caching with prefixed or suffixed tables.Rhett Sutphin2008-04-302-3/+7
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* | best solution?Steven Soroka2008-05-012-2/+14
|/ | | | Signed-off-by: Steven Soroka <ssoroka78@gmail.com>
* Fixed that pessimistic locking you reference the quoted table name (Josh ↵David Heinemeier Hansson2008-04-304-2/+12
| | | | Susser) [#67 state:resolved]
* Forgot theseDavid Heinemeier Hansson2008-04-303-0/+8
|
* Fixed tests (and the weird assumption that no logger would mean that the ↵David Heinemeier Hansson2008-04-302-20/+8
| | | | code wasnt run)
* Added test for has_one partial rendering (keeran) [#43 state:resolved]David Heinemeier Hansson2008-04-303-1/+20
|
* Fixed render :partial => @collection.named_scope (nkallen) [#61 state:resolved]David Heinemeier Hansson2008-04-303-11/+9
|
* Ensure postgresql tests work when starting from scratch.Frederick Cheung2008-04-302-3/+1
|
* Change tests against all scope to base scope as all is now used as a finder ↵David Heinemeier Hansson2008-04-303-14/+17
| | | | alias
* Fixed tabs to spaces [#47 state:resolved]David Heinemeier Hansson2008-04-292-4/+4
|
* Fixed response logging to use length instead of the entire thing (seangeo) ↵David Heinemeier Hansson2008-04-292-1/+3
| | | | [#27 state:resolved]
* Fixed that change_column should be able to use :null => true on a field that ↵David Heinemeier Hansson2008-04-292-1/+10
| | | | formerly had false [Nate Wiger] [#26 state:resolved]
* Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-04-297-16/+60
|\
| * Add missing clear method to memory_storeTobias Lütke2008-04-291-0/+4
| |
| * Allow access to mem_cache_store's stats hashTobias Lütke2008-04-291-0/+4
| |
| * Implement increment/decrement on cache storage engines, using read/write by ↵Tobias Lütke2008-04-293-3/+37
| | | | | | | | default and using atomic command on memcache
| * By default rails will update keys in memcached when using Rails.cache.write. ↵Tobias Lütke2008-04-291-6/+5
| | | | | | | | Use :unless_exist => true flag to prevent existing keys from being overwritten.
| * Clarify confusing ActionController::Base.allow_concurrency flag.Jeremy Kemper2008-04-281-3/+4
| |
| * Note that allow_concurrency = true means you need to ↵Jeremy Kemper2008-04-281-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 Kemper2008-04-281-3/+3
| | | | | | | | actually works
* | Default integer need not specify a limit [#20371 state:resolved] (matthuhiggins)David Heinemeier Hansson2008-04-291-1/+1
|/
* Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-04-282-5/+15
|\
| * Ruby 1.9 compat: force assert_select text encoding to the encoding of the ↵Jeremy Kemper2008-04-282-5/+15
| | | | | | | | regexp it's matching against.
| * Revert alias_method_chain exceptions as they broke aliasing class methods.Michael Koziarski2008-04-282-18/+1
| | | | | | | | This reverts commit be48cad9a41ebf88ae19f2381a57917d532734c9.
| * Make alias_method_chain complain about duplicate aliases. PreviouslyJohn Barnette2008-04-282-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/lastDavid Heinemeier Hansson2008-04-283-1/+10
|/
* Fixed that BenchmarkHelper should use controller.logger instead of @logger ↵David Heinemeier Hansson2008-04-271-3/+5
| | | | (which now apparently is gone)
* Added ActionController::TestCase#rescue_action_in_public! to control whether ↵David Heinemeier Hansson2008-04-272-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/railsDavid Heinemeier Hansson2008-04-2711-13/+90
|\
| * Be friendlier when upgrading apps with an old boot.rb.John Barnette2008-04-281-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 Kandratsenka2008-04-271-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 Koziarski2008-04-261-2/+2
| | | | | | | | | | | | stores. [monki] [#40 state:resolved]
| * Ensure table names are quoted by the association preloading code.Frederick Cheung2008-04-268-10/+83
| | | | | | | | | | | | [#45 state:resolved] Signed-off-by: Michael Koziarski <michael@koziarski.com>