aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/rails/railsRizwan Reza2010-06-0538-64/+173
|\
| * AS guide: removes your spurious lineXavier Noria2010-06-051-2/+0
| |
| * removes Array#random_element and backports Array#sample from Ruby 1.9, ↵Xavier Noria2010-06-058-25/+66
| | | | | | | | thanks to Marc-Andre Lafortune
| * Missed fixing the banner on the Usage output for ThorMikel Lindsaar2010-06-041-1/+1
| | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Updating guides to new rails initialization processMikel Lindsaar2010-06-044-7/+7
| | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Changing command line API from 'rails blog' to 'rails new blog'.Mikel Lindsaar2010-06-044-5/+15
| | | | | | | | | | | | | | | | | | | | Also removed the limitation of not being able to call your new server any of the rails commands (generate, server, dbconsole, console etc) as there is no longer any ambiguity here. http://rails.lighthouseapp.com/projects/8994/tickets/4665 Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Properly cache association_collection#scopes calls having argumentsPratik Naik2010-06-043-1/+16
| |
| * Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2010-06-021-2/+1
| |\
| | * Add an asset_host accessor for consistency.José Valim2010-06-021-2/+1
| | |
| * | Missed the extractionDavid Heinemeier Hansson2010-06-021-0/+9
| |/
| * Extract assets paths and make them available to Action Mailer as wellDavid Heinemeier Hansson2010-06-024-1/+13
| |
| * Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2010-06-0225-58/+133
| |\
| | * Changes made while working on upgrading cells to Rails 3wycats2010-06-025-4/+8
| | |
| | * Merge branch 'master' of github.com:rails/railswycats2010-06-0241-104/+316
| | |\
| | | * Special treatement for Relation#select { with block }Pratik Naik2010-06-022-1/+19
| | | |
| | | * Configure generators before invoking.José Valim2010-06-021-0/+1
| | | |
| | | * Still copy application configuration to generator even if they are required ↵José Valim2010-06-025-16/+13
| | | | | | | | | | | | | | | | earlier. Also tidy up the guide a little bit.
| | * | Update CHANGELOGwycats2010-05-302-1/+3
| | | |
| * | | You need the ruby-debug available in your Gemfile for debugger to workDavid Heinemeier Hansson2010-06-022-1/+4
| | | |
* | | | Improve Rails README [#4740 state:resolved]Matt Di Pasquale2010-06-052-204/+302
| | | | | | | | | | | | | | | | Signed-off-by: Rizwan Reza <rizwanreza@gmail.com>
* | | | AR validations: update sections 2.4 and 17.1eparreno2010-06-021-3/+7
| | | |
* | | | Routing: fix error in nested resources with name_prefix example [#146 ↵eparreno2010-06-021-1/+1
| | | | | | | | | | | | | | | | state:resolved]
* | | | Revert "Guides: Give code container a proper bottom margin"Josiah Ivey2010-06-011-2/+1
| | | | | | | | | | | | | | | | This reverts commit 4b71fc22ca205db8f083c2eab1cc3969f7addb69.
* | | | Guides: Give code container a proper bottom marginJosiah Ivey2010-06-011-1/+2
| |_|/ |/| |
* | | Merge remote branch 'docrails/master'Xavier Noria2010-06-025-13/+42
|\ \ \
| * | | AS guide: documents String#truncateXavier Noria2010-06-021-0/+33
| | | |
| * | | AR validations & callbacks: update callbacks listeparreno2010-05-311-9/+5
| | | |
| * | | add <%= to fields_for exampleseparreno2010-05-283-4/+4
| | | |
* | | | revises the documentation of String#truncate and the truncate helperXavier Noria2010-06-022-22/+18
| | | |
* | | | Add lib to load paths when application is inherited to be able to load lib ↵José Valim2010-06-023-1/+29
| |/ / |/| | | | | | | | code during configuration.
* | | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2010-06-0114-21/+44
|\ \ \
| * | | revises rdoc of AMo::Error#add [#4738 state:resolved]Xavier Noria2010-06-011-6/+6
| | | |
| * | | Unforce text-format from AMSantiago Pastorino2010-06-014-7/+10
| | | | | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * | | Unforce memcache from ASSantiago Pastorino2010-06-013-3/+9
| | | | | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * | | Unforce builder from ASSantiago Pastorino2010-06-016-3/+10
| | | | | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * | | Unforce tzinfo from ASSantiago Pastorino2010-06-014-2/+9
| | | | | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | | | Extracted String#truncate from TextHelper#truncate [DHH]David Heinemeier Hansson2010-06-014-11/+69
|/ / /
* | | Base options cant live in lazy loaded helpers as they then wont be available ↵David Heinemeier Hansson2010-05-312-7/+4
| | | | | | | | | | | | to set for config
* | | Unforce i18n from ASSantiago Pastorino2010-05-316-6/+19
| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | | rack-test version updated and removed from GemfileSantiago Pastorino2010-05-312-2/+1
| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | | Add :only and :except to controllers MiddlewareStack. This allowsJosé Valim2010-05-303-18/+71
| |/ |/| | | | | | | | | | | | | you to do the following: class PostsController < ApplicationController use AutheMiddleware, :except => [:index, :show] end
* | Update template to allow handlers to more cleanly handle encodings (ht: nex3)wycats2010-05-304-69/+78
| |
* | Remove the laziness from the middleware stack.José Valim2010-05-299-106/+51
| |
* | Now that we always return a proxy from mb_chars, even in 1.9, all Strings ↵wycats2010-05-291-3/+5
| | | | | | | | coming back from AS are UTF-8.
* | fix translation test in actionpack [#4701 state:commited]Santiago Pastorino2010-05-291-1/+1
| | | | | | | | Signed-off-by: wycats <wycats@gmail.com>
* | Removing Metal from Rails 3. wycats2010-05-2920-319/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you have existing Metals, you have a few options: * if your metal behaves like a middleware, add it to the middleware stack via config.middleware.use. You can use methods on the middleware stack to control exactly where it should go * if it behaves like a Rack endpoint, you can link to it in the router. This will result in more optimal routing time, and allows you to remove code in your endpoint that matches specific URLs in favor of the more powerful handling in the router itself. For the future, you can use ActionController::Metal to get a very fast controller with the ability to opt-in to specific controller features without paying the penalty of the full controller stack. Since Rails 3 is closer to Rack, the Metal abstraction is no longer needed.
* | Merge commit 'mislav/counter_cache'Michael Koziarski2010-05-293-63/+95
|\ \
| * | fix `reset_counters` to work even with complex class namesMislav Marohnić2010-05-242-4/+31
| | | | | | | | | | | | | | | | | | e.g. it guesses that a belongs_to association to Namespace::MyModel is named "my_model", unlike before where it would look up an association named "namespace::mymodel" and fail.
| * | move counter_cache tests to a separate file and refactorMislav Marohnić2010-05-242-49/+58
| | |
| * | cleanup `update/reset_counters`: less SQL strings, more ActiveRecord/ArelMislav Marohnić2010-05-241-12/+8
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-17 03:23:46 +0000