aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * update Rails::Generators docs [ci skip]Francesco Rodriguez2012-10-0722-43/+35
| * nodoc JS::Generators [ci skip]Francesco Rodriguez2012-10-071-3/+3
| * nodoc Erb::Generators [ci skip]Francesco Rodriguez2012-10-074-11/+11
| * nodoc CSS::Generators [ci skip]Francesco Rodriguez2012-10-072-6/+6
| * nodoc TestUnit::Generators [ci skip]Francesco Rodriguez2012-10-0710-30/+30
| * Update railties/lib/rails/generators/rails/app/templates/config/environments/...Adrien Lamothe2012-10-061-1/+2
| * Update guides/source/action_mailer_basics.mdAdrien Lamothe2012-10-061-1/+1
| * add AC::Parameters#permit_all_parameters config option [ci skip]Francesco Rodriguez2012-10-051-1/+3
| * remove old AR Mass Assignment config options [ci skip]Francesco Rodriguez2012-10-051-4/+0
| * Merge pull request #115 from ruggeri/masterFrancesco Rodríguez2012-10-051-2/+0
| |\
| | * remove non sequitur NOTE on :includeNed Ruggeri2012-10-011-2/+0
| * | delete removed page cache options [ci skip]Francesco Rodriguez2012-10-051-10/+2
| * | use default_static_extension instead of page_cache_extension deprecated optio...Francesco Rodriguez2012-10-051-1/+1
| * | update caching with rails guide to reflect action and page extraction [ci skip]Francesco Rodriguez2012-10-051-5/+8
| * | Add CollectionAssociation#destroy to ActiveRecord::Association::ClassMethods ...Samuel Cochran2012-10-051-3/+15
| * | Add CollectionAssociation#destroy to association guideSamuel Cochran2012-10-051-0/+23
| * | Merge pull request #116 from jarednipper/masterJared Nipper2012-10-031-2/+2
| |\ \
| | * | Fixed typo in command to run unit testJared Nipper2012-10-011-1/+1
| | * | Fixed typo in command to run unit testJared Nipper2012-10-011-1/+1
| | |/
| * | Fix all examples in comments in active_model attribute methodsNick Rowe2012-10-021-6/+6
| * | Fix Example in active model attribute methodsNick Rowe2012-10-021-1/+1
| * | Fixing markdown typos in upgrading_ruby_on_rails.mdDavid A McClain2012-10-021-2/+4
| * | Add command before bash output schneems2012-10-021-0/+3
| * | add command line $ tip for new programmersschneems2012-10-021-0/+2
| * | improve wording over `change` method docsschneems2012-10-021-1/+1
| * | instructions for running migrations in another ENVschneems2012-10-021-1/+9
| * | Add /rails/info/routes method to getting_startedschneems2012-10-021-3/+3
| * | explain how to check if the server has returned on *nix systems in getting_st...schneems2012-10-021-1/+1
| * | Explain that command line commands have $schneems2012-10-021-0/+7
| * | change `#` to `$` in bash sectionschneems2012-10-021-1/+1
| * | Space between "every" and "time"schneems2012-10-021-1/+1
| * | use <url> markdown syntax instead of [url](url) [ci skip]Francesco Rodriguez2012-10-011-13/+13
| * | Fix truncated line in the i18n edge guideVictor Costan2012-10-011-1/+1
| |/
| * fix example in Migration docs [ci skip]Francesco Rodriguez2012-09-301-1/+1
| * add change_table transformation to Migration docs [ci skip]Francesco Rodriguez2012-09-301-16/+19
| * updates latest Rails version numberFabrizio Regini2012-09-301-1/+1
| * Make strong_parameters example simplerGuillermo Iguaran2012-09-301-4/+5
* | fix github url [ci skip]Vijay Dev2012-10-111-1/+1
* | Merge pull request #7902 from josh/fix-bug-in-as-cache-upgradeDavid Heinemeier Hansson2012-10-101-1/+1
|\ \
| * | Ensure expires_in and created_at timestamps aren't nil when attempting to upg...Joshua Peek2012-10-101-1/+1
|/ /
* | Add changelog entry for killing the asset tag concatenationDavid Heinemeier Hansson2012-10-101-0/+2
* | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2012-10-1060-1349/+266
|\ \
| * \ Merge pull request #7900 from josh/kill-old-asset-tag-helper-concatDavid Heinemeier Hansson2012-10-105-1132/+16
| |\ \
| | * | Remove expansion configJoshua Peek2012-10-101-2/+0
| | * | Remove old asset tag concatenationJoshua Peek2012-10-105-1130/+16
| |/ /
| * | Merge pull request #7899 from asanghi/masterVijay Dev2012-10-102-0/+6
| |\ \
| | * | Add missing CHANGELOG related to addition of callbacks to mailers.Aditya Sanghi2012-10-102-0/+6
| * | | Merge pull request #7897 from arunagw/warning_fixes_assert_matchVijay Dev2012-10-101-7/+7
| |\ \ \ | | |/ / | |/| |
| | * | warning fixed: ambiguous first argument; put parentheses or even spacesArun Agrawal2012-10-101-7/+7
| * | | Merge pull request #7895 from mdaisuke/guides_typoVijay Dev2012-10-091-1/+1
| |\ \ \ | | |/ / | |/| |