aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-12-3021-149/+165
| | | |\ \ \ \
| | | | * \ \ \ Merge commit 'fred/pullable'Pratik Naik2008-12-307-10/+52
| | | | |\ \ \ \
| | | | | * | | | Fixed incorrect parsing of query parameters with mixed-depth nesting inside ↵Mark Reginald James2008-12-282-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an array [#1622 state:resolved] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
| | | | | * | | | Fix to_sentence being used with options removed by 273c77Frederick Cheung2008-12-271-1/+1
| | | | | | | | |
| | | | | * | | | Fix HasManyAssociation#create ignoring the :primary_key option [#1633 ↵Roman Shterenzon2008-12-272-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
| | | | | * | | | Fix :include of has_one with :primary_key optionFrederick Cheung2008-12-262-1/+17
| | | | | | | | |
| | | | | * | | | Fix :include of has_many associations with :primary_key optionFrederick Cheung2008-12-263-2/+19
| | | | | | | | |
| | | | * | | | | Fix named scope tests for sqlite3 [#1667 state:resolved]Mike Gunderloy2008-12-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | | | * | | | | Add transaction check to SQLite2 adapter to fix ↵Mike Gunderloy2008-12-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_sqlite_add_column_in_transaction_raises_statement_invalid [#1669 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | | | * | | | | Clean up view path cruft and split path implementations into Template::Path ↵Joshua Peek2008-12-2912-138/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and Template::EagerPath
| | | * | | | | | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-12-29125-1651/+4177
| | | |\| | | | |
| | | | * | | | | Fix failing gem dependency tests [#1659 state:resolved]Mike Gunderloy2008-12-291-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | | | * | | | | Fix FCGI dispatching testsMike Gunderloy2008-12-291-42/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | | | * | | | | Use rack namespace for routing argsJoshua Peek2008-12-281-2/+2
| | | | | | | | |
| | | | * | | | | Make router and controller classes better rack citizensJoshua Peek2008-12-288-87/+88
| | | | | | | | |
| | | | * | | | | HTTP Digest authentication [#1230 state:resolved]Joshua Peek2008-12-284-2/+432
| | | | | | | | |
| | | | * | | | | Allow custom rails generators to pass in their own binding to Create command ↵Joshua Peek2008-12-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so that the corresponding erb templates get rendered with the proper binding [#1493 state:resolved]
| | | | * | | | | Allow multiple conditions for callbacks [#1627 state:resolved]Joshua Peek2008-12-282-8/+43
| | | | | | | | |
| | | * | | | | | Don't construct object deprecation proxy if unneededJeremy Kemper2008-12-221-4/+3
| | | | | | | | |
| | * | | | | | | Fixed the AssetTagHelper cache to use the computed asset host as part of the ↵David Heinemeier Hansson2009-01-013-5/+27
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | cache key instead of just assuming the its a string [#1299 state:committed]
| | * | | | | | Fix 'i18n' require broken by 0.0.1 -> 0.1.1 commit [#1658 state:committed]Yaroslav Markin2008-12-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| | * | | | | | Update i18n gem to version 0.1.1 (Rails' changes were backported) [#1635 ↵Yaroslav Markin2008-12-2816-71/+884
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| | * | | | | | Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-12-2828-296/+373
| | |\ \ \ \ \ \
| | * | | | | | | Introduce dynamic scopes for ActiveRecord: you can now use class methods ↵Yaroslav Markin2008-12-285-1/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | like scoped_by_user_name(user_name) and scoped_by_user_name_and_password(user_name, password) that will use the scoped method with attributes you supply. [#1648 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * | | | | | | | Regen htmlPratik Naik2009-01-101-35/+36
| | | | | | | | |
| * | | | | | | | Copy editing on performance test guide.Mike Gunderloy2009-01-101-34/+36
| | | | | | | | |
| * | | | | | | | Add command line tools to perf guidePratik Naik2009-01-102-14/+154
| | | | | | | | |
| * | | | | | | | Fix typosPratik Naik2009-01-102-20/+20
| | | | | | | | |
| * | | | | | | | Add a note about tuning perf test runsPratik Naik2009-01-102-23/+75
| | | | | | | | |
| * | | | | | | | Minor changes in performance guidePratik Naik2009-01-104-53/+72
| | | | | | | | |
| * | | | | | | | Some examples for perf testingPratik Naik2009-01-102-32/+231
| | | | | | | | |
| * | | | | | | | Keep movin stuff in perf guidePratik Naik2009-01-102-57/+94
| | | | | | | | |
| * | | | | | | | More refactoring in perf guidePratik Naik2009-01-102-217/+233
| | | | | | | | |
* | | | | | | | | Clarified use of assert_select with blocks in testing guide and rdoc textColin Law2009-01-112-10/+32
|/ / / / / / / /
* | | | | | | | Some more perf guide stuffPratik Naik2009-01-093-195/+221
| | | | | | | |
* | | | | | | | Added :allow_blank to the common validation options sectionCassioMarques2009-01-082-2/+31
| | | | | | | |
* | | | | | | | Moved validates_each to the last position of it's section. Added VIM swap ↵CassioMarques2009-01-083-38/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files to .gitignore
* | | | | | | | Update performance testing guide stuffPratik Naik2009-01-0811-1696/+721
| | | | | | | |
* | | | | | | | Regen guidesPratik Naik2009-01-071-4/+4
| | | | | | | |
* | | | | | | | Rewrite ActiveRecord::Base#destroy_all docs to remove incorrect info, ↵Chris Kampmeier2009-01-061-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mention return value, and improve clarity (The incorrect information is "at least 2*N database queries" -- it's N+1 at best.)
* | | | | | | | Correctly formatted commentMarc Chung2009-01-041-5/+5
| | | | | | | |
* | | | | | | | Merge branch 'master' of git@github.com:lifo/docrailsFrederick Cheung2009-01-0411-1208/+1226
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git@github.com:lifo/docrails: Complete draft of configuring guide; add configuring guide to index; regenerate HTML. FIx bad date in Guide changelog. Update table syntax in guides to fix deprecation warnings during build. Regenarate html
| * | | | | | | | Complete draft of configuring guide; add configuring guide to index; ↵Mike Gunderloy2009-01-035-72/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | regenerate HTML.
| * | | | | | | | FIx bad date in Guide changelog.Mike Gunderloy2009-01-031-1/+1
| | | | | | | | |
| * | | | | | | | Update table syntax in guides to fix deprecation warnings during build.Mike Gunderloy2009-01-024-1034/+528
| | | | | | | | |
| * | | | | | | | Regenarate htmlPratik Naik2009-01-012-101/+499
| | | | | | | | |
* | | | | | | | | fix typos etc. picked up by XavierFrederick Cheung2009-01-041-4/+4
|/ / / / / / / /
* | | | | | | | Mention another complex forms pluginFrederick Cheung2009-01-011-2/+3
| | | | | | | |
* | | | | | | | Add stub section on complex forms until a definitive solution makes it into coreFrederick Cheung2009-01-011-4/+12
| | | | | | | |
* | | | | | | | merge work on form helpers guideFrederick Cheung2009-01-011-80/+371
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'form_helpers' * form_helpers: (30 commits) claridy handling missing files Bevy of typo corrections first stab at the section on file uploads Delete todo section info on namespaces Rearrange the date and form builder sections Flesh out the section on parameter names move the fields_for/form builder section higher up waffle about parameter names and fields_for Clarify fields_for and form builders explain fields_for First draft of section on parameter names Added section on date/time helpers country_select url typos minor clarifications Warning about using select on associations Fix one last remaining 'we' ActiveRecord -> Active Record put credits at end, consistent with other guides ...