Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git://github.com/rails/rails | Rizwan Reza | 2010-06-05 | 38 | -64/+173 |
|\ | |||||
| * | AS guide: removes your spurious line | Xavier Noria | 2010-06-05 | 1 | -2/+0 |
| | | |||||
| * | removes Array#random_element and backports Array#sample from Ruby 1.9, ↵ | Xavier Noria | 2010-06-05 | 8 | -25/+66 |
| | | | | | | | | thanks to Marc-Andre Lafortune | ||||
| * | Missed fixing the banner on the Usage output for Thor | Mikel Lindsaar | 2010-06-04 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | Updating guides to new rails initialization process | Mikel Lindsaar | 2010-06-04 | 4 | -7/+7 |
| | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | Changing command line API from 'rails blog' to 'rails new blog'. | Mikel Lindsaar | 2010-06-04 | 4 | -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 arguments | Pratik Naik | 2010-06-04 | 3 | -1/+16 |
| | | |||||
| * | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2010-06-02 | 1 | -2/+1 |
| |\ | |||||
| | * | Add an asset_host accessor for consistency. | José Valim | 2010-06-02 | 1 | -2/+1 |
| | | | |||||
| * | | Missed the extraction | David Heinemeier Hansson | 2010-06-02 | 1 | -0/+9 |
| |/ | |||||
| * | Extract assets paths and make them available to Action Mailer as well | David Heinemeier Hansson | 2010-06-02 | 4 | -1/+13 |
| | | |||||
| * | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2010-06-02 | 25 | -58/+133 |
| |\ | |||||
| | * | Changes made while working on upgrading cells to Rails 3 | wycats | 2010-06-02 | 5 | -4/+8 |
| | | | |||||
| | * | Merge branch 'master' of github.com:rails/rails | wycats | 2010-06-02 | 41 | -104/+316 |
| | |\ | |||||
| | | * | Special treatement for Relation#select { with block } | Pratik Naik | 2010-06-02 | 2 | -1/+19 |
| | | | | |||||
| | | * | Configure generators before invoking. | José Valim | 2010-06-02 | 1 | -0/+1 |
| | | | | |||||
| | | * | Still copy application configuration to generator even if they are required ↵ | José Valim | 2010-06-02 | 5 | -16/+13 |
| | | | | | | | | | | | | | | | | earlier. Also tidy up the guide a little bit. | ||||
| | * | | Update CHANGELOG | wycats | 2010-05-30 | 2 | -1/+3 |
| | | | | |||||
| * | | | You need the ruby-debug available in your Gemfile for debugger to work | David Heinemeier Hansson | 2010-06-02 | 2 | -1/+4 |
| | | | | |||||
* | | | | Improve Rails README [#4740 state:resolved] | Matt Di Pasquale | 2010-06-05 | 2 | -204/+302 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rizwan Reza <rizwanreza@gmail.com> | ||||
* | | | | AR validations: update sections 2.4 and 17.1 | eparreno | 2010-06-02 | 1 | -3/+7 |
| | | | | |||||
* | | | | Routing: fix error in nested resources with name_prefix example [#146 ↵ | eparreno | 2010-06-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | state:resolved] | ||||
* | | | | Revert "Guides: Give code container a proper bottom margin" | Josiah Ivey | 2010-06-01 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | This reverts commit 4b71fc22ca205db8f083c2eab1cc3969f7addb69. | ||||
* | | | | Guides: Give code container a proper bottom margin | Josiah Ivey | 2010-06-01 | 1 | -1/+2 |
| |_|/ |/| | | |||||
* | | | Merge remote branch 'docrails/master' | Xavier Noria | 2010-06-02 | 5 | -13/+42 |
|\ \ \ | |||||
| * | | | AS guide: documents String#truncate | Xavier Noria | 2010-06-02 | 1 | -0/+33 |
| | | | | |||||
| * | | | AR validations & callbacks: update callbacks list | eparreno | 2010-05-31 | 1 | -9/+5 |
| | | | | |||||
| * | | | add <%= to fields_for examples | eparreno | 2010-05-28 | 3 | -4/+4 |
| | | | | |||||
* | | | | revises the documentation of String#truncate and the truncate helper | Xavier Noria | 2010-06-02 | 2 | -22/+18 |
| | | | | |||||
* | | | | Add lib to load paths when application is inherited to be able to load lib ↵ | José Valim | 2010-06-02 | 3 | -1/+29 |
| |/ / |/| | | | | | | | | code during configuration. | ||||
* | | | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2010-06-01 | 14 | -21/+44 |
|\ \ \ | |||||
| * | | | revises rdoc of AMo::Error#add [#4738 state:resolved] | Xavier Noria | 2010-06-01 | 1 | -6/+6 |
| | | | | |||||
| * | | | Unforce text-format from AM | Santiago Pastorino | 2010-06-01 | 4 | -7/+10 |
| | | | | | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | | | Unforce memcache from AS | Santiago Pastorino | 2010-06-01 | 3 | -3/+9 |
| | | | | | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | | | Unforce builder from AS | Santiago Pastorino | 2010-06-01 | 6 | -3/+10 |
| | | | | | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | | | Unforce tzinfo from AS | Santiago Pastorino | 2010-06-01 | 4 | -2/+9 |
| | | | | | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | | | Extracted String#truncate from TextHelper#truncate [DHH] | David Heinemeier Hansson | 2010-06-01 | 4 | -11/+69 |
|/ / / | |||||
* | | | Base options cant live in lazy loaded helpers as they then wont be available ↵ | David Heinemeier Hansson | 2010-05-31 | 2 | -7/+4 |
| | | | | | | | | | | | | to set for config | ||||
* | | | Unforce i18n from AS | Santiago Pastorino | 2010-05-31 | 6 | -6/+19 |
| | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | | rack-test version updated and removed from Gemfile | Santiago Pastorino | 2010-05-31 | 2 | -2/+1 |
| | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | | Add :only and :except to controllers MiddlewareStack. This allows | José Valim | 2010-05-30 | 3 | -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) | wycats | 2010-05-30 | 4 | -69/+78 |
| | | |||||
* | | Remove the laziness from the middleware stack. | José Valim | 2010-05-29 | 9 | -106/+51 |
| | | |||||
* | | Now that we always return a proxy from mb_chars, even in 1.9, all Strings ↵ | wycats | 2010-05-29 | 1 | -3/+5 |
| | | | | | | | | coming back from AS are UTF-8. | ||||
* | | fix translation test in actionpack [#4701 state:commited] | Santiago Pastorino | 2010-05-29 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | | Removing Metal from Rails 3. | wycats | 2010-05-29 | 20 | -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 Koziarski | 2010-05-29 | 3 | -63/+95 |
|\ \ | |||||
| * | | fix `reset_counters` to work even with complex class names | Mislav Marohnić | 2010-05-24 | 2 | -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 refactor | Mislav Marohnić | 2010-05-24 | 2 | -49/+58 |
| | | | |||||
| * | | cleanup `update/reset_counters`: less SQL strings, more ActiveRecord/Arel | Mislav Marohnić | 2010-05-24 | 1 | -12/+8 |
| | | |