aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Readme file changes:Rizwan Reza2010-06-052-112/+46
| | | | | | | * Took out stuff that's not relevant (or useful) anymore. * Some formatting. * Added helpful links to get started with Rails. * Took out Apache htaccess tutorial since we aren't teaching Apache here.
* Merge branch 'master' of git://github.com/rails/railsRizwan Reza2010-06-0516-35/+54
|\
| * 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-053-5/+16
| | | | | | | | 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>
| * Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2010-06-0214-31/+85
| |\
| | * Merge branch 'master' of github.com:rails/railswycats2010-06-0213-30/+84
| | |\
| | | * 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-301-1/+1
| | | |
| * | | You need the ruby-debug available in your Gemfile for debugger to workDavid Heinemeier Hansson2010-06-021-0/+3
| |/ /
* | | 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
| | |
* | | Add lib to load paths when application is inherited to be able to load lib ↵José Valim2010-06-023-1/+29
| |/ |/| | | | | code during configuration.
* | Remove the laziness from the middleware stack.José Valim2010-05-297-32/+34
| |
* | Removing Metal from Rails 3. wycats2010-05-2918-289/+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.
* | performance and integration tests inherit from AD, not ACGonçalo Silva2010-05-282-2/+2
|/ | | | Signed-off-by: wycats <wycats@gmail.com>
* Merge remote branch 'rails/master'Xavier Noria2010-05-274-9/+17
|\
| * Missing changelog headingJeremy Kemper2010-05-231-0/+5
| |
| * Fix a bug where I18n fallbacks modules where not included in the proper ↵José Valim2010-05-231-7/+10
| | | | | | | | backend if it was set through config.i18n.backend.
| * Fix typo on rackup test (ht: pleax)José Valim2010-05-201-1/+1
| |
| * refactor evals and adds some __FILE__ and __LINE__Santiago Pastorino2010-05-201-1/+1
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | Form Helpers guide: Use new syntax for fields_for examplesJosiah Ivey2010-05-251-4/+4
| |
* | Cover more of the Rails initialization process, regarding the internals of ↵Ryan Bigg2010-05-251-3/+63
| | | | | | | | YourApp::Application inheritance from Rails::Application and more.
* | Fixed XHTML on activerecord_validation_callbacks guideJaime Iniesta2010-05-241-3/+4
| |
* | Added info about guides validation to Contribute guideJaime Iniesta2010-05-241-0/+1
| |
* | Fixed minor typo on creditsJaime Iniesta2010-05-241-1/+1
| |
* | Merge branch 'w3c_validator'Jaime Iniesta2010-05-242-0/+73
|\ \
| * | New rake validate_guides task to validate output/*.html against the W3C ↵Jaime Iniesta2010-05-242-0/+73
| |/ | | | | | | Validator
* / Getting Started, don't forget to link to yourself if you are adding to the ↵Rohit Arondekar2010-05-211-2/+1
|/ | | | changelog.
* Merge remote branch 'rails/master'Xavier Noria2010-05-198-39/+45
|\
| * Final iteration of use better testing methodsNeeraj Singh2010-05-191-2/+2
| | | | | | | | | | | | [#4652 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Kill legacy dispatcher.José Valim2010-05-181-24/+0
| |
| * Simplify cookie_store by simply relying on cookies.signed.José Valim2010-05-183-9/+8
| |
| * Renames Array#rand -> Array#random_elementRizwan Reza2010-05-171-2/+2
| | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com>
| * Revert "Moved encoding work in progress to a feature branch."wycats2010-05-174-2/+33
| | | | | | | | This reverts commit ade756fe42423033bae8e5aea8f58782f7a6c517.
* | Testing guide: Replace removed wordJosiah Ivey2010-05-181-1/+1
| |
* | Testing guide: Grammar, punctuation, and emphasize that test/unit is only ↵Josiah Ivey2010-05-181-13/+13
| | | | | | | | the default
* | Guides: Fix numerous broken linksJosiah Ivey2010-05-166-9/+8
| |
* | Merge branch 'master' of git://github.com/rails/railsRizwan Reza2010-05-1725-139/+271
|\|
| * Moved encoding work in progress to a feature branch.Jeremy Kemper2010-05-164-33/+2
| | | | | | | | This reverts commits af0d1a88157942c6e6398dbf73891cff1e152405 and 64d109e3539ad600f58536d3ecabd2f87b67fd1c.
| * Significantly improved internal encoding heuristics and support.wycats2010-05-164-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Default Encoding.default_internal to UTF-8 * Eliminated the use of file-wide magic comments to coerce code evaluated inside the file * Read templates as BINARY, use default_external or template-wide magic comments inside the Template to set the initial encoding * This means that template handlers in Ruby 1.9 will receive Strings encoded in default_internal (UTF-8 by default) * Create a better Exception for encoding issues, and use it when the template source has bytes that are not compatible with the specified encoding * Allow template handlers to opt-into handling BINARY. If they do so, they need to do some of their own manual encoding work * Added a "Configuration Gotchas" section to the intro Rails Guide instructing users to use UTF-8 for everything * Use config.encoding= in Ruby 1.8, and raise if a value that is an invalid $KCODE value is used Also: * Fixed a few tests that were assert() rather than assert_equal() and were caught by Minitest requiring a String for the message * Fixed a test where an assert_select was misformed, also caught by Minitest being more restrictive * Fixed a test where a Rack response was returning a String rather than an Enumerable