aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 comp...Hongli Lai (Phusion2008-05-011-2/+6
* | 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 state:re...Pratik Naik2008-05-014-3/+30
| * Fixed AssociationsPreload such that it doesnt require foreign keys to be inte...David Heinemeier Hansson2008-04-304-12/+44
| * Cheaper Dependencies#log_call to resolve irritating error message w/ rake db:...David Heinemeier Hansson2008-04-301-4/+6
| * Added block-setting of attributes for Base.create like Base.new already has (...David Heinemeier Hansson2008-04-305-4/+56
| * Fixed labels that have a bracketed name and an index [#68 state:resolved]Kevin Glowacz2008-04-302-0/+13
| * 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
* | best solution?Steven Soroka2008-05-012-2/+14
|/
* Fixed that pessimistic locking you reference the quoted table name (Josh Suss...David Heinemeier Hansson2008-04-304-2/+12
* Forgot theseDavid Heinemeier Hansson2008-04-303-0/+8
* Fixed tests (and the weird assumption that no logger would mean that the code...David Heinemeier Hansson2008-04-302-20/+8
* 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 a...David Heinemeier Hansson2008-04-303-14/+17
* 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
* Fixed that change_column should be able to use :null => true on a field that ...David Heinemeier Hansson2008-04-292-1/+10
* 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 d...Tobias Lütke2008-04-293-3/+37
| * By default rails will update keys in memcached when using Rails.cache.write. ...Tobias Lütke2008-04-291-6/+5
| * Clarify confusing ActionController::Base.allow_concurrency flag.Jeremy Kemper2008-04-281-3/+4
| * Note that allow_concurrency = true means you need to verify_active_connection...Jeremy Kemper2008-04-281-1/+3
| * run prepare callbacks after after_initialize blocks so config.to_prepare actu...Jeremy Kemper2008-04-281-3/+3
* | 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 reg...Jeremy Kemper2008-04-282-5/+15
| * Revert alias_method_chain exceptions as they broke aliasing class methods.Michael Koziarski2008-04-282-18/+1
| * Make alias_method_chain complain about duplicate aliases. PreviouslyJohn Barnette2008-04-282-1/+18
* | 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 (w...David Heinemeier Hansson2008-04-271-3/+5
* Added ActionController::TestCase#rescue_action_in_public! to control whether ...David Heinemeier Hansson2008-04-272-2/+23
* 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
| * Remove old :limit removal code from find_initial, logic is now handled in the...Aliaksey Kandratsenka2008-04-271-1/+1
| * Add default options to file_store to make it align with the other cache store...Michael Koziarski2008-04-261-2/+2
| * Ensure table names are quoted by the association preloading code.Frederick Cheung2008-04-268-10/+83
* | Changing "and" to && whereever I catch itDavid Heinemeier Hansson2008-04-271-1/+1
|/
* Added that the MySQL adapter should map integer to either smallint, int, or b...David Heinemeier Hansson2008-04-252-0/+18
* Pass template object to Handler#compilePratik Naik2008-04-244-4/+4
* Use .gitignore as the convention for dummy file names.Joshua Peek2008-04-246-0/+0
* Fixes a subtle bug when using symbols for key definitions in habtm associationsDavid Dollar2008-04-232-3/+32
* preventing generated documentation from being picked up by git. [#37 state:re...Sam Granieri2008-04-231-1/+7