aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into erboutJeremy Kemper2008-06-061-13/+11
|\
| * Remove 1.9's String#chars alsoJeremy Kemper2008-06-061-13/+11
* | Merge branch 'master' into erboutJeremy Kemper2008-06-064-31/+21
|\|
| * GemDependency#specification should be publicJeremy Kemper2008-06-061-16/+15
| * Simplify ActiveRecord::Base#update_attributePratik Naik2008-06-072-13/+4
| * Qualify Inflector in rdoc examples also. [#356 state:resolved]Jeremy Kemper2008-06-061-2/+2
* | Remove some internal dead code that supported content_forJeremy Kemper2008-06-064-38/+6
* | concat should ignore nilJeremy Kemper2008-06-062-1/+9
* | javascript_tag should only concat when block_given?Jeremy Kemper2008-06-062-7/+14
* | Merge branch 'master' into erboutJeremy Kemper2008-06-062-6/+12
|\|
| * Drop a string conversion from the often-called tag_options helperJeremy Kemper2008-06-061-3/+4
| * Generate less garbage when expanding range bind variables in conditionsJeremy Kemper2008-06-061-3/+8
* | Merge branch 'master' into erboutJeremy Kemper2008-06-065-15/+68
|\|
| * Move Class::ModelName to Active Support module core_extJeremy Kemper2008-06-064-18/+48
| * Cache RecordIdentifier methods in Class#model_name wrapperJeremy Kemper2008-06-061-11/+34
| * Fix doc typo. Move extend self so it's more immediately obvious. Require infl...Jeremy Kemper2008-06-061-4/+4
* | Merge branch 'master' into erboutJeremy Kemper2008-06-055-5/+18
|\|
| * Ensure render :file works inside templatesPratik Naik2008-06-054-2/+15
| * Make partial counter start from 0.Frederick Cheung2008-06-052-3/+3
* | Merge branch 'master' into erboutJeremy Kemper2008-06-0517-78/+78
|\|
| * Fix that Rails::InfoController testsPratik Naik2008-06-051-0/+4
| * Ensure plugins' rake tasks are loaded before application's rake tasks. [#259 ...Ryan Kinderman2008-06-051-1/+1
| * Use CGI::Cookie::parse for request cookies until we officially deprecated CGI.Joshua Peek2008-06-042-42/+8
| * Renamed StringQuestioneer to StringInquirer.Joshua Peek2008-06-047-20/+20
| * Namespaced StringQuestioneer under ActiveSupport.Joshua Peek2008-06-043-11/+13
| * Fixed deprecated call to Dependencies in plugin loader test.Joshua Peek2008-06-041-4/+4
| * Give a nice message if there are duplicate migrations instead of raising a st...Jeremy Kemper2008-06-041-3/+14
| * Add RJS#page.reload. [#277 state:resolved]Sean Huber2008-06-043-0/+17
* | Merge branch 'master' into erboutJeremy Kemper2008-06-0345-1551/+1750
|\|
| * Dependencies move to ActiveSupport::Dependencies missed a few spotsDavid Heinemeier Hansson2008-06-032-9/+9
| * Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-06-032-4/+21
| |\
| | * Fix assert_redirected_to for nested controllers and named routesGabe da Silveira2008-06-042-4/+21
| | * Merge branch 'master' into patchesMichael Koziarski2008-06-0477-1626/+2509
| | |\
| | * | Remove dead code, and the tests for it.Michael Koziarski2008-05-312-261/+0
| | * | Substitute value into validates_format_of messageJohn D. Hume2008-05-312-1/+7
| * | | Fixed Request#remote_ip to only raise hell if the HTTP_CLIENT_IP and HTTP_X_F...David Heinemeier Hansson2008-06-033-4/+12
| | |/ | |/|
| * | Wrapped Rails.env in StringQuestioneer so you can do Rails.env.development? [...David Heinemeier Hansson2008-06-036-1/+31
| * | Add more standard Hash methods to ActiveSupport::OrderedHash [#314 state:reso...Steve Purcell2008-06-033-0/+37
| * | Allow caches_action to accept a layout option [#198 state:resolved]josevalim2008-06-033-3/+34
| * | Callbacks fire before notifying observers [#230 state:resolved]Craig Demyanovich2008-06-032-2/+40
| * | Fixed ambiguous first argument warning in ArrayExtTest.Joshua Peek2008-06-031-14/+12
| * | Namespace Inflector, Dependencies, OrderedOptions, and TimeZone under ActiveS...Joshua Peek2008-06-0327-1514/+1554
* | | Stack @output_buffer for nested renderingJeremy Kemper2008-06-032-3/+3
* | | Don't pass block binding to concatJeremy Kemper2008-06-028-31/+21
* | | Work with @output_buffer instead of _erboutJeremy Kemper2008-06-0213-206/+220
* | | Try replacing _erbout with @output_bufferJeremy Kemper2008-06-026-54/+25
|/ /
* | Added tests [#279 state:resolved] (Nicholas Schlueter)David Heinemeier Hansson2008-06-023-0/+10
* | Fixed Date#end_of_quarter to not blow up on May 31st [#289 state:resolved] (D...David Heinemeier Hansson2008-06-023-1/+7
* | Fixed Base#exists? to check status code as integer [#299 state:resolved] (Wes...David Heinemeier Hansson2008-06-022-1/+6
* | Fixed that RailsInfoController wasnt considering all requests local in develo...David Heinemeier Hansson2008-06-022-1/+6