aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fixed example for :finder_sql clst2011-12-121-1/+1
* disambiguate "and not" when explaining "&& return"Suraj N. Kurapati2011-12-111-1/+1
* Fixing typo in Routing Guide.Ryan Sandridge2011-12-101-1/+1
* Replacing vague mention of an unspecified section above with a link to the ac...Ryan Sandridge2011-12-081-1/+1
* Typo in listMikhail Dieterle2011-12-081-1/+1
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-12-066-17/+21
|\
| * Revert "Added link to ActiveResource::Base documentation"Vijay Dev2011-12-061-1/+1
| * use textile syntax in linksVijay Dev2011-12-061-1/+1
| * rxml and rhtml are no longer searched for source code annotationsVijay Dev2011-12-061-1/+1
| * copy edits in layouts guide, change links to be relativeVijay Dev2011-12-061-6/+6
| * Added link to ActiveResource::Base documentationsandeepravi2011-12-061-1/+1
| * Added link to ActiveResource::Base documentationsandeepravi2011-12-061-1/+1
| * Added git --rebase option for pulling rails masterThomas von Deyen2011-12-061-1/+1
| * Added wiki link to RESTsandeepravi2011-12-061-1/+1
| * Added wiki link for RESTsandeepravi2011-12-061-1/+1
| * Use do end for multiline block.Uģis Ozols2011-12-051-2/+2
| * .rhtml and .rxml was removed in Rails 3.Uģis Ozols2011-12-051-2/+2
| * Merge branch 'master' of github.com:lifo/docrailsSergey Parizhskiy2011-12-051-1/+1
| |\
| | * Remove redundant orJason Noble2011-12-051-1/+1
| * | changes in the way of how the stylesheets_link_tag worksSergey Parizhskiy2011-12-051-5/+9
| |/
* | Sync AP CHANGELOG with 3-1-stableSantiago Pastorino2011-12-061-0/+8
* | Merge pull request #3428 from adrianpike/asset_path_conflictsSantiago Pastorino2011-12-062-8/+66
|\ \
| * | Let's do the same trick for asset_path that we do for [image,javascript,style...Adrian Pike2011-12-052-8/+66
* | | Ensure length validator also works on 1.8.7.José Valim2011-12-061-6/+17
* | | Merge pull request #3876 from tvdeyen/string_as_url_for_expire_actionJosé Valim2011-12-062-3/+22
|\ \ \
| * | | Allowing string as url argument for expire_actionThomas von Deyen2011-12-062-3/+22
|/ / /
* | | Merge pull request #3872 from marcandre/i18n_keyJosé Valim2011-12-062-2/+22
|\ \ \
| * | | ActiveModel::Name#i18n_key: Fix doc and add testsMarc-Andre Lafortune2011-12-052-2/+22
| |/ /
* | | Merge pull request #3873 from iangreenleaf/no_default_tokenizerJosé Valim2011-12-061-2/+1
|\ \ \
| * | | Don't tokenize string when counting charactersIan Young2011-12-041-2/+1
* | | | make method signatures match the superclass signatureAaron Patterson2011-12-051-2/+2
* | | | return value is never tested, so stop calling `presence`Aaron Patterson2011-12-051-1/+1
| |/ / |/| |
* | | Quitoting the table name before querying.Aaron Patterson2011-12-051-1/+1
* | | Merge pull request #3867 from jadeforrest/masterAaron Patterson2011-12-051-1/+6
|\ \ \
| * | | Speed up table_exists? for databases with a large number of tablesJade Rubick2011-12-051-1/+6
* | | | Merge pull request #3866 from ugisozols/masterJosé Valim2011-12-051-5/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Remove .rxml, .rjs and .rhtml from source annotation regexp.Uģis Ozols2011-12-051-5/+5
|/ / /
* | | Merge pull request #3861 from andyjeffries/masterJosé Valim2011-12-052-3/+3
|\ \ \
| * | | Named Routes shouldn't override existing ones (currently route recognition go...Andy Jeffries2011-12-052-3/+3
* | | | Merge pull request #3863 from lest/params-wrapper-inflectionsJosé Valim2011-12-052-1/+36
|\ \ \ \ | |/ / / |/| | |
| * | | use classify in ParamsWrapper to derive model name from controller namelest2011-12-052-1/+36
|/ / /
* | | Namespaced attribute lookup now works as 'model/association.attribute'.José Valim2011-12-052-11/+19
* | | Merge pull request #3859 from kuroda/human_attribute_nameJosé Valim2011-12-052-2/+16
|\ \ \
| * | | Fix human_attribute_name to handle names with dotsTsutomu Kuroda2011-12-052-2/+16
* | | | Merge pull request #3858 from Overbryd/redirect_to_url_with_network_path_refe...Xavier Noria2011-12-051-1/+2
|\ \ \ \
| * | | | Minor enhancement by not unnecessarely escaping forward slashing within a cur...Overbryd2011-12-051-1/+2
* | | | | Merge pull request #3857 from Overbryd/redirect_to_url_with_network_path_refe...José Valim2011-12-052-2/+12
|\| | | | | |_|/ / |/| | |
| * | | Fix for redirect_to to respect urls with a network path reference like "//ass...Overbryd2011-12-052-2/+12
|/ / /
* | | Merge pull request #3854 from exviva/validates_associated_marked_for_destructionJosé Valim2011-12-042-2/+13
|\ \ \
| * | | Do not validate associated records marked for destructionOlek Janiszewski2011-12-052-2/+13