aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | 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
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * 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 ↵Jeremy Kemper2008-06-041-3/+14
| | | | | | | | strange insert error
| * Add RJS#page.reload. [#277 state:resolved]Sean Huber2008-06-043-0/+17
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | 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
| | | | | | | | | | | | | | | | | | [#308 state:resolved] Signed-off-by: Michael Koziarski <michael@koziarski.com>
| | * 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
| | | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * | | Fixed Request#remote_ip to only raise hell if the HTTP_CLIENT_IP and ↵David Heinemeier Hansson2008-06-033-4/+12
| | |/ | |/| | | | | | | HTTP_X_FORWARDED_FOR doesnt match (not just if theyre both present) [Mark Imbriaco, Bradford Folkens]
| * | Wrapped Rails.env in StringQuestioneer so you can do Rails.env.development? ↵David Heinemeier Hansson2008-06-036-1/+31
| | | | | | | | | | | | [DHH]
| * | Add more standard Hash methods to ActiveSupport::OrderedHash [#314 ↵Steve Purcell2008-06-033-0/+37
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * | Allow caches_action to accept a layout option [#198 state:resolved]josevalim2008-06-033-3/+34
| | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * | Callbacks fire before notifying observers [#230 state:resolved]Craig Demyanovich2008-06-032-2/+40
| | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * | Fixed ambiguous first argument warning in ArrayExtTest.Joshua Peek2008-06-031-14/+12
| | |
| * | Namespace Inflector, Dependencies, OrderedOptions, and TimeZone under ↵Joshua Peek2008-06-0327-1514/+1554
| | | | | | | | | | | | ActiveSupport [#238 state:resolved]
* | | 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] ↵David Heinemeier Hansson2008-06-023-1/+7
| | | | | | | | (Danger)
* | Fixed Base#exists? to check status code as integer [#299 state:resolved] ↵David Heinemeier Hansson2008-06-022-1/+6
| | | | | | | | (Wes Oldenbeuving)
* | Fixed that RailsInfoController wasnt considering all requests local in ↵David Heinemeier Hansson2008-06-022-1/+6
| | | | | | | | development mode (Edgard Castro) [#310 state:resolved]
* | Ensure Rack processor reads CGI output_cookies for the session cookie.Joshua Peek2008-06-023-8/+60
| |
* | Fixed the brokeness from 952ec79bec313e0001adfc8c86f7970448d32db9David Heinemeier Hansson2008-06-021-1/+1
| |
* | AR can be disabled, new_rails_defaults.rb should check [#303 state:resolved] ↵David Heinemeier Hansson2008-06-021-4/+6
| | | | | | | | (Jesper Hvirring Henriksen)
* | Added a test for GzipDavid Heinemeier Hansson2008-06-021-0/+7
| |
* | Ensure AR#sum result is typecasted properlyPratik Naik2008-06-022-2/+8
| |
* | Faster Hash#slice that doesn't use Enumerable#include?.Cheah Chu Yeow2008-06-021-1/+3
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | Fixed initializer tests by stubbing out gems dependencies check.Joshua Peek2008-06-022-20/+25
| |
* | In 9c4f003, gem installation quotes versions. Do the same for unpack and ↵Joshua Peek2008-06-022-16/+16
| | | | | | | | update tests to reflect the change.
* | Fixed changelog merge.Marcos Tapajos2008-06-021-1/+0
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* | Ensure Associations#sum returns 0 when no rows are returned. [#295 ↵Jonathan Viney2008-06-022-4/+5
| | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | Added Rack middleware to handle static files.Joshua Peek2008-06-013-0/+41
| |
* | Added Rack processorEzra Zygmuntowicz2008-06-016-1/+515
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* | Added SQL escaping for :limit and :offset in MySQL [Jonathan Wiess]David Heinemeier Hansson2008-06-013-2/+8
| |
* | Previously we only added the "lib" subdirectory to the load path whenrick2008-05-311-1/+3
| | | | | | | | | | | | | | | | setting up gem dependencies for frozen gems. Now we add the "ext" subdirectory as well for those gems which have compiled C extensions as well. [Wincent Colaiuta] [#268 state:resolved]
* | fix changelog conflictrick2008-05-3124-304/+69
|\ \
| * | revert mysql test credential changeJeremy Kemper2008-05-311-2/+2
| | |