aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Opt in to JSONJeremy Kemper2009-04-225-1/+7
* No more free lunchJeremy Kemper2009-04-2214-21/+38
* stdlib autoloads were hanging on 1.9.1Jeremy Kemper2009-04-223-9/+6
* Get Active Model in the mixJeremy Kemper2009-04-221-1/+1
* Divert CoreExtensions mention in docsJeremy Kemper2009-04-221-1/+1
* Convert string extension modules to class reopensJeremy Kemper2009-04-226-291/+247
* ActiveSupport.core_ext bridge util no longer usedJeremy Kemper2009-04-221-10/+0
* Switch last module core extension to class reopenJeremy Kemper2009-04-222-21/+6
* Merge branch 'master' into cherryJeremy Kemper2009-04-226-18/+96
|\
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-04-224-16/+80
| |\
| | * Fix test_rescue_routing_exceptions when running with rakeJoshua Peek2009-04-211-13/+15
| | * refactor some coupled rescue testsJoshua Peek2009-04-211-16/+78
| | * Session tests belong under dispatch folderJoshua Peek2009-04-213-0/+0
| * | Rack::Utils.body_to_s doesn't exist in 1.0Jeremy Kemper2009-04-222-2/+16
| |/
* | Merge branch 'master' into cherryJeremy Kemper2009-04-2115-331/+536
|\|
| * Reinstate Base#render_to_string. Introduce AbstractController#render_to_strin...Jeremy Kemper2009-04-213-6/+38
| * Add microsecond support for sqlite adapter [#1982 state:resolved]Alex Pooley2009-04-212-1/+11
| * Update rails:template task to expand file paths [#2528 state:resolved]Stephen Celis2009-04-211-1/+3
| * Fix nginx config in ci setup notes [Chad Woolley] [#2290 state:resolved]Pratik Naik2009-04-211-4/+13
| * Remove excess mocking from polymorphic_url tests [#2330 state:resolved]Mike Gunderloy2009-04-212-293/+394
| * Change table to prevent copying indexes on sqlite2Pratik Naik2009-04-211-5/+5
| * Specify :group with the table name for it to work on sqlite3Pratik Naik2009-04-211-1/+1
| * Fix tests for sqlite3 3.6.xxPratik Naik2009-04-211-1/+1
| * Fixed dumping from postgresql columns in index in wrong order. [#2515 state:r...Max Lapshin2009-04-213-15/+25
| * Quote table names when casting to regclass so that capitalized tables are sup...Scott Woods2009-04-214-3/+34
| * Fixed wrong quoting of index names in postgres [#2402 state:resolved]Max Lapshin2009-04-212-1/+11
* | Merge branch 'master' into cherryJeremy Kemper2009-04-2011-35/+38
|\|
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-04-2011-35/+38
| |\
| | * Ensure :dependent => :delete_all works for association with hash conditionsPratik Naik2009-04-204-9/+14
| | * Ensure JoinAssociation uses aliased table name when multiple associations hav...Pratik Naik2009-04-205-5/+12
| | * Always buffer rack.input if it is not rewindableMislav Marohnić2009-04-174-18/+11
| | * Improve rewindable input test coverage so tests fail when you remove the midd...Mislav Marohnić2009-04-172-4/+2
* | | Merge branch 'master' into cherryJeremy Kemper2009-04-20321-3022/+6746
|\| |
| * | Clearer String#first and #last edge cases. Fix that 'foo'.first(0) == 'foo' i...Jeremy Kemper2009-04-201-2/+14
| * | Treating strings as enumerable is deprecatedJeremy Kemper2009-04-201-6/+6
| * | render_for_text pushes a body part instead of replacing the whole bodyJeremy Kemper2009-04-172-10/+12
| * | Don't set Content-Length in Base#response_body= since body may be any Rack-co...Jeremy Kemper2009-04-171-1/+0
| * | Rename render_to_string to render_to_body since it may return any Rack-compat...Jeremy Kemper2009-04-176-14/+14
| * | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-04-1710-32/+121
| |\|
| | * Merge docrailslifo2009-04-1710-32/+121
| * | Clearer String#first and #last edge cases. Fix that foo.first(0) == instead ...Jeremy Kemper2009-04-172-3/+17
| |/
| * Added :touch option to belongs_to associations that will touch the parent rec...David Heinemeier Hansson2009-04-166-29/+110
| * Added ActiveRecord::Base#touch to update the updated_at/on attributes with th...David Heinemeier Hansson2009-04-163-9/+64
| * Make more Template methods public to make ActionMailer tests passCarl Lerche & Yehuda Katz2009-04-162-9/+9
| * Don't check authenticity tokens for any AJAX requestsRoss Kaffenburger and Bryan Helmkamp2009-04-153-6/+10
| * Makes rails-dev-boost work againCarl Lerche & Yehuda Katz2009-04-1412-120/+126
| * Move middleware stack out of utils folderJoshua Peek2009-04-141-1/+1
| * Make dispatcher instances immutableJoshua Peek2009-04-141-3/+14
| * Final blow to CGIJoshua Peek2009-04-141-14/+3
| * We aren't using UploadedStringIO and UploadedTempfile anymoreJoshua Peek2009-04-141-1/+1