aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | Merge pull request #9982 from prathamesh-sonpatki/railite-typoCarlos Antonio da Silva2013-03-281-1/+1
| |\ \ \
| | * | | Fix typoPrathamesh Sonpatki2013-03-281-1/+1
| |/ / /
| * | | contrib guide: documents guidelines for running the test suiteXavier Noria2013-03-281-0/+11
| * | | contrib guide: documents how to generate a --dev applicationXavier Noria2013-03-281-0/+16
| * | | Merge pull request #9977 from vipulnsward/fix_column_test_typoRafael Mendonça França2013-03-281-3/+3
| |\ \ \ | | |/ / | |/| |
| | * | anual_salary => annual_salaryVipul A M2013-03-281-3/+3
| |/ /
| * | Merge pull request #9974 from prathamesh-sonpatki/change_logSteve Klabnik2013-03-281-1/+1
| |\ \
| | * | Removed unused variable in procPrathamesh Sonpatki2013-03-281-1/+1
| |/ /
| * | Merge pull request #9972 from divineforest/fix-overriden-typoRafael Mendonça França2013-03-284-5/+5
| |\ \
| | * | Fix typo: overriden => overriDDenAlexander Balashov2013-03-284-5/+5
| * | | Merge pull request #9973 from prathamesh-sonpatki/AR-typosRafael Mendonça França2013-03-283-5/+5
| |\ \ \
| | * | | Fixed typos in ActiveRecordPrathamesh Sonpatki2013-03-283-5/+5
| |/ / /
| * | | Merge pull request #9970 from divineforest/fix-typoRafael Mendonça França2013-03-281-1/+1
| |\ \ \
| | * | | Fix typoAlexander Balashov2013-03-281-1/+1
| | |/ /
| * | | Use snake case variable names, stick with the conventionCarlos Antonio da Silva2013-03-281-13/+13
| * | | Merge pull request #9967 from choudhuryanupam/fix_actionpack_test_casesCarlos Antonio da Silva2013-03-282-3/+3
| |\ \ \
| | * | | Refactored to remove unused variableAnupam Choudhury2013-03-282-3/+3
| * | | | Merge pull request #9963 from obrie/fix/after_create_updatesCarlos Antonio da Silva2013-03-282-1/+17
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix updates not working within after_create hooksAaron Pfeifer2013-03-272-1/+17
| * | | | Merge pull request #9968 from choudhuryanupam/fix_typo_n_grammarCarlos Antonio da Silva2013-03-281-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fixed grammarAnupam Choudhury2013-03-281-1/+1
| |/ / /
| * | | determine_constant_from_test_name does not swallow NoMethodErrors [Yves Senn]Xavier Noria2013-03-282-0/+12
| * | | Add coffee-rails and javascript runtime to gemfile if skip_javascript isRafael Mendonça França2013-03-281-2/+9
| * | | Merge pull request #9944 from where/rebased-fulltext-spacialRafael Mendonça França2013-03-2713-37/+108
| |\ \ \