aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add Action View Overview to guides listing.Jonathan Roes2013-04-041-0/+4
* Basic Layouts overview w/ link to guideJonathan Roes2013-04-041-7/+2
* describe Action Mailer I18n subject lookupYves Senn2013-04-041-0/+22
* [layout/rendering guide] move sentence to new line to follow convention in ot...Weston Platter2013-04-041-1/+3
* [layout/rendering guide] remove redundant wordingWeston Platter2013-04-031-3/+1
* fix broken format in ActionView::Helpers::NumberHelper [ci skip]Francesco Rodriguez2013-04-031-0/+25
* Fixed TypoPrathamesh Sonpatki2013-04-031-1/+1
* Changed rspec/model directory example to spec/modelsPrathamesh Sonpatki2013-04-031-2/+2
* Typos/grammar fixesJonathan Roes2013-04-031-3/+3
* fix formatting typo, + should be `Yves Senn2013-04-031-1/+1
* add `(association)`_type to schema convetions in AR basics guide.Yves Senn2013-04-031-0/+2
* link the Active Record pattern to the EAA CatalogYves Senn2013-04-031-4/+5
* remove trailing whitespace from AR Basics guideYves Senn2013-04-031-94/+94
* remove broken links from reference section in debugging guide.Yves Senn2013-04-031-3/+0
* adjust config.ru tempalte used in the rails on rack guideYves Senn2013-04-031-4/+7
* Merge branch 'master' of github.com:lifo/docrailsOliver Jakubiec2013-04-02310-1667/+4334
|\
| * mark relation mutator as :nodoc: [ci skip]Francesco Rodriguez2013-04-021-2/+1
| * Merge pull request #131 from lazylester/masterGrayson Wright2013-04-021-1/+1
| |\
| | * as of Rails 3.2.13 it appears that importing an engine's migration into the h...Les Nightingill2013-03-311-1/+1
| * | Proofreading tweaks to the Mailer guideJonathan Roes2013-04-011-15/+15
| * | Merge pull request #129 from rafBM/masterVijay Dev2013-04-011-2/+2
| |\ \
| | * | Remove “Sweepers” from Caching TOC and mention Page/Action caching are re...Rafaël Blais Masson2013-03-241-2/+2
| * | | Merge pull request #132 from hlee/masterKen2013-03-311-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | fixed a article link at sitepointKen Lu2013-03-311-1/+1
| |/ /
| * | Remove unnecessary / confusing code in exampleJonathan Roes2013-03-311-11/+2
| * | Fix typoCarson McDonald2013-03-311-1/+1
| * | minor copy editingNeeraj Singh2013-03-303-4/+9
| * | Merge branch 'master' of github.com:rails/railsVijay Dev2013-03-30306-1613/+4285
| |\ \
| | * \ Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-03-3044-208/+274
| | |\ \
| | * | | adds the API home page to the gemspec, needed for doc:railsXavier Noria2013-03-301-1/+1
| | * | | typoXavier Noria2013-03-301-1/+1
| | * | | registers the new doc:rails behaviour in the changelogXavier Noria2013-03-301-0/+5
| | * | | rdoc is no longer a gem dependency, sdoc becomes a runtime dependencyXavier Noria2013-03-303-1/+10
| | * | | unifies API generationXavier Noria2013-03-303-54/+35
| | * | | moves RDOC_MAIN.rdoc to railtiesXavier Noria2013-03-302-1/+1
| | * | | encapsulates API generation in Rails::API::TaskXavier Noria2013-03-304-84/+197
| | * | | changes the RDoc title of the APIXavier Noria2013-03-301-1/+1
| | * | | Merge pull request #9998 from neerajdotname/association-docSteve Klabnik2013-03-291-2/+2
| | |\ \ \
| | | * | | Do not use deprecate method [ci skip]Neeraj Singh2013-03-291-1/+1
| | | * | | fix broken sentence [ci skip]Neeraj Singh2013-03-291-1/+1
| | |/ / /
| | * | | removes bindir from the rails gemspecXavier Noria2013-03-291-3/+1
| | * | | removes activerecord/examples/associations.pngXavier Noria2013-03-292-6/+0
| | * | | Merge pull request #9989 from robertomiranda/group-assetsGuillermo Iguaran2013-03-281-12/+11
| | |\ \ \
| | | * | | Update Gemfile since group assets doesn't exist anymore in Gemfilerobertomiranda2013-03-281-12/+11
| | * | | | Merge pull request #9987 from robertomiranda/group-assetsRafael Mendonça França2013-03-281-2/+3
| | |\| | |
| | | * | | Update Bundler require in getting started applicationrobertomiranda2013-03-281-2/+3
| | |/ / /
| | * | | Update the call to Bundler.require in application.rb since assets group doesn...Guillermo Iguaran2013-03-281-2/+3
| | * | | Add better comments to assets gemsGuillermo Iguaran2013-03-281-9/+22
| | * | | Merge pull request #9984 from ranjaykrishna/col-probRafael Mendonça França2013-03-283-4/+8
| | |\ \ \
| | | * | | added comments to test_invalid_type in sqlite3 adapter test and added valid_t...Ranjay Krishna2013-03-283-4/+8