aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix merge conflict with actionpack changelogrick2008-05-1073-790/+1356
|\
| * Make render shorthands work with namespaced controllersJacek Becela2008-05-104-48/+195
| * Escape globbed parameters in routes correctly.Chris Roos2008-05-102-9/+12
| * Merge docrails:Pratik Naik2008-05-0934-570/+658
| * ActionView::InstanceTag#default_time_from_options with hash args uses Time.cu...gbuesing2008-05-083-3/+29
| * Adding Date.current, which returns Time.zone.today if config.time_zone is set...gbuesing2008-05-086-1/+42
| * Base#instantiate_time_object: eliminate check for Time.zone, since we can ass...gbuesing2008-05-082-1/+3
| * TimeWithZone: date part getter methods (#year #mon #day etc) are defined on c...gbuesing2008-05-083-1/+19
| * Updating changelogsgbuesing2008-05-082-0/+6
| * Time.zone.parse: return nil for strings with no date informationgbuesing2008-05-083-2/+12
| * Time.zone.parse: compatibility with far future date with time zone offset in ...gbuesing2008-05-082-3/+13
| * ActiveRecord time zone aware attributes: blank string is treated as nil when ...gbuesing2008-05-082-3/+11
| * Fix Time.zone.parse from stripping time zone information and make Time aware ...Scott Fleckenstein2008-05-084-1/+39
| * Calling ActiveRecord#inspect on an unloaded association won't wipe the collec...Andreas Neuhaus2008-05-083-2/+12
| * Some dbconsole tweaks. [#102 state:resolved]Jeremy Kemper2008-05-071-20/+26
| * Add script/dbconsole to app generatorJeremy Kemper2008-05-072-1/+3
| * Add 'script/dbconsole' -- the database analog of 'script/console'Steve Purcell2008-05-072-0/+52
| * create_table :force => true no longer tries to drop a non-existing tableTarmo Tänav2008-05-072-2/+20
| * Added AbstractAdapter#table_exists? and made AbstractAdapter#table implementa...Tarmo Tänav2008-05-074-128/+119
| * Delegate action_name to controller inside views.Pratik Naik2008-05-062-1/+10
| * Add class to deprecate instance variablesPratik Naik2008-05-062-0/+24
| * Refactored and fixed Resources.map_member_actions to make use of custom Actio...Marcos Arias2008-05-062-9/+29
| * Added logic to associations.rb to make sure select_for_limited_idsJohn Devine2008-05-062-1/+33
| * Ensure correct record is returned when preloading has_one where more than one...Frederick Cheung2008-05-063-1/+12
| * Merge branch 'master' of git@github.com:rails/railsMichael Koziarski2008-05-0616-241/+320
| |\
| * | PostgreSQL: update rake tasks to use full settings from database.ymlPete Deffendol2008-05-041-8/+3
* | | change ActionController::RequestForgeryProtection to use Mime::Type#verify_re...rick2008-05-065-12/+84
* | | include bugfix to [e792d4ab70448f79142fdf492390682ff5ea6398] for rubygems 1.0...rick2008-05-061-2/+3
* | | Change the request forgery protection to go by Content-Type instead of reques...rick2008-05-063-5/+28
| |/ |/|
* | Fixed form helper's name attribute for question methodsAndrew Vit2008-05-062-5/+18
* | Fix bug where plugin init.rb files from frozen gem specs weren't being run. ...rick2008-05-061-0/+2
* | Merge commit 'e792d4ab70448f79142fdf492390682ff5ea6398'rick2008-05-051-1/+2
|\ \
| * | Added code to make initialization process call rails/init.rb for unpacked gemsPaul Barry2008-05-061-1/+2
* | | regression test for bug introduced in [6a6b4392c16c665eb713705f2b38e959a658ee...rick2008-05-051-0/+13
* | | Allow ActionController::Base#default_url_options to have a default options ar...Cheah Chu Yeow2008-05-053-5/+5
* | | Restore dump_schema_information connection adapter methodKyle Hargraves2008-05-051-0/+6
* | | Merge commit 'core/master'rick2008-05-05163-1150/+2333
|\| |
| * | Added Ruby 1.8 implementation of Process.daemonJoshua Peek2008-05-054-10/+30
| * | Added OrderedHash#delete [#113 state:resolved]Sean Ouimet2008-05-052-0/+19
| * | Preload TimeZone zones for thread safety.Joshua Peek2008-05-041-217/+222
| * | Replaced unnecessary class variable with a constant in whiny nil.Joshua Peek2008-05-041-3/+3
| |/
| * Ensure that default_url_options, if defined, are used in named routes.Cheah Chu Yeow2008-05-043-5/+39
| * Allow custom loggers to work with script/server.Michael Koziarski2008-05-041-8/+8
| * PostgreSQL: Connect to template1 database when creating or dropping dbPete Deffendol2008-05-041-2/+2
| * Added change_table for migrations (Jeff Dean) [#71 state:resolved]David Heinemeier Hansson2008-05-037-9/+507
| * Improve documentation coverage and markupXavier Noria2008-05-0275-659/+811
| * Improve PartialTemplate testsPratik Naik2008-05-024-7/+13
| * Capture view errors in ActionView::Template.Nathan Weizenbaum2008-05-024-13/+16
| * Fixed that TextHelper#text_field would corrypt when raw HTML was used as the ...David Heinemeier Hansson2008-05-013-0/+19
| * Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-05-013-7/+17
| |\