aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [engines guide] make it clear that the scaffold generator output isn't part ↵Ryan Bigg2011-10-141-6/+11
| | | | of the actual command
* [engines guide] correct render line is blorgh/comments/formRyan Bigg2011-10-141-1/+1
|
* [engines guide] improve wording for sentence describing comments/form partialRyan Bigg2011-10-141-1/+1
|
* improved ActiveResource's .element_path and .new_element_path methods ↵Diego Carrion2011-10-131-0/+8
| | | | documentation by specifing how .site should be declared in order to use prefix_options
* [engines guide] don't show actual timestamp in migration generationRyan Bigg2011-10-131-1/+1
|
* [engines guide] change comments resource generationRyan Bigg2011-10-131-54/+33
| | | | | | | | Totally didn't like where this section was going, so scrapped it. Scaffold is great for some things (lol) but nested resources is definitely not one of them. Best to walk people through how to do it right, as they would in the real world
* refactor guide exampleVijay Dev2011-10-131-3/+3
|
* change activerecord query conditions example to avoid 'type' as column nameSteve Bourne2011-10-121-2/+2
| | | | | | | | 'Type' is a reserved column for STI. Changed conditions example to avoid using that column name as an example. The example isn't STI-related (and mentioning STI here is needless clutter), so changing to avoid accidentally encouraging users to use 'type' as a column name for other purposes.
* quoting 'and' to make it more distinct.Craig Monson2011-10-121-1/+1
|
* status is a number in Rails 3Akira Matsuda2011-10-121-2/+2
|
* Runtime conditions for associations should use procsStephen Pike2011-10-111-4/+2
| | | | | | | The association guide previously recommended using a trick with single quote delaying of string interpolation in order to handle setting association conditions that would be evaluated at runtime. Using a proc is the new way as this no longer works.
* Heavy copy editing of the find_each and find_in_batches sectionmhutchin2011-10-111-26/+34
|
* Use .add instead of << to add errorsEvgeniy Dolzhenko2011-10-113-6/+6
|
* Merge pull request #71 from rahul100885/rahul100885_workspaceRahul P. Chaudhari2011-10-111-2/+2
|\ | | | | Fixed typos in active_support_core_extensions.textile
| * Fixed typos in active_support_core_extensions.textileRAHUL CHAUDHARI2011-10-111-2/+2
|/
* Add ActionController#head exampleAlexey Vakhov2011-10-111-0/+2
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-10-104-26/+245
|\
| * [engines guide] add TODO for RedCarpet exampleRyan Bigg2011-10-101-1/+1
| |
| * [engines guide] cover generating the comment resourceRyan Bigg2011-10-101-2/+84
| |
| * Fix rails/generators/base.rb documentation for generator lookupRyan Bigg2011-10-101-3/+3
| |
| * [engines guide] amend two TODOs for further things in this guideRyan Bigg2011-10-101-1/+2
| |
| * [engines guide] finish covering what the scaffold generator does within an ↵Ryan Bigg2011-10-101-2/+42
| | | | | | | | engine
| * [engines guide] final line changeRyan Bigg2011-10-101-1/+2
| |
| * [engines guide] Add TODO for mentioning rails s and rails cRyan Bigg2011-10-101-0/+2
| |
| * [engines guide] begin explaining what the scaffold generator outputs within ↵Ryan Bigg2011-10-101-2/+56
| | | | | | | | an engine
| * [engines guide] reword first two dot points in prologueRyan Bigg2011-10-101-2/+2
| |
| * [engines guide] Credit where credit is due + explaning directory structureRyan Bigg2011-10-101-3/+40
| |
| * [engines guide] Credit where credit is dueRyan Bigg2011-10-101-0/+2
| |
| * Copy editing to improve readability, consistency, and tonemhutchin2011-10-091-4/+4
| |
| * Minor copy editingmhutchin2011-10-091-1/+1
| |
| * Merge pull request #70 from mcdd/masterGuillermo Iguaran2011-10-091-2/+2
| |\ | | | | | | Update security guide ActiveRecordStore/SessionStore
| | * ActiveRecordStore is now called SessionStore.Dan McDonald2011-10-091-2/+2
| | |
| * | Copy editing: s/Rails guesses/Rails assumes/gmhutchin2011-10-091-7/+7
| |/
* | Merge pull request #3274 from arunagw/warning_removed_mysql2Vijay Dev2011-10-101-2/+2
|\ \ | | | | | | ambiguous first argument; put parentheses or even spaces Warning removed!
| * | ambiguous first argument; put parentheses or even spaces Warning removed!Arun Agrawal2011-10-101-2/+2
| | |
* | | Merge pull request #3265 from arunagw/warning_uri_parserVijay Dev2011-10-101-1/+1
|\ \ \ | | | | | | | | URI.escape is obsolete : warning removed
| * | | URI.escape is obsolete : warning removedArun Agrawal2011-10-091-1/+1
| | | |
* | | | Merge pull request #3275 from simi/patch-1José Valim2011-10-101-7/+8
|\ \ \ \ | | | | | | | | | | Improve ActiveRecord changelog
| * | | | Active Record changelog mistakesJosef Šimánek2011-10-101-7/+8
|/ / / /
* | | | Merge pull request #3272 from odorcicd/fix_json_error_rootJosé Valim2011-10-102-1/+35
|\ \ \ \ | |_|/ / |/| | | JSON responder should return errors with :errors root
| * | | JSON responder should return errors with :error rootDenis Odorcic2011-10-102-1/+35
|/ / /
* | | Use broken YAML that will fail with Syck as well as Psych. Fixes ↵Jon Leighton2011-10-091-2/+2
| | | | | | | | | | | | | | | | | | test_broken_yaml_exception in fixtures_test.rb on Ruby 1.8.7. Cherry-pick from 3-1-stable: b8d46924e70e0847e92e1d2dbaaec8c11381072c
* | | Remove stray whitespaceJeremy Kemper2011-10-091-4/+1
| | |
* | | Only use LOWER for mysql case insensitive uniqueness check when column has a ↵Joseph Palermo2011-10-0910-12/+139
| | | | | | | | | | | | case sensitive collation.
* | | Merge pull request #3270 from kennyj/fix_invalid_regexSantiago Pastorino2011-10-091-1/+1
|\ \ \ | |_|/ |/| | (small patch) fix invalid regex in testcase
| * | fix invalid regexkennyj2011-10-101-1/+1
|/ /
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-10-095-18/+84
|\ \
| * | Corrections to the ajax guide recent changes. This guide is veryVijay Dev2011-10-091-32/+26
| | | | | | | | | | | | outdated and will need a lot of changes to make it useful for Rails 3+
| * | Fix a typo that was mysteriously entered in previous commitRoy Tomeij2011-10-091-1/+1
| | |
| * | Add note about how Sass & Sprockets don't matchRoy Tomeij2011-10-091-1/+3
| | |