aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #7738 from grosser/verified_requestRafael Mendonça França2012-09-254-8/+24
|\ \ \ \
| * | | | depreacte unused Mime::Type#verify_request? and Mime::Type.browser_generated_...grosser2012-09-244-8/+24
* | | | | some copy-editing I did in passingXavier Noria2012-09-251-26/+28
* | | | | gives credit to Aaron in the CHANGELOG entry for AC::LiveXavier Noria2012-09-251-2/+4
* | | | | Merge pull request #7727 from frodsan/security_guide_spRafael Mendonça França2012-09-241-58/+79
|\ \ \ \ \
| * | | | | update Security guide to reflect mass assignment protection with StrongParame...Francesco Rodriguez2012-09-241-58/+79
* | | | | | Only apply log tags if the logger supports itJeremy Kemper2012-09-241-1/+1
| |_|/ / / |/| | | |
* | | | | Merge pull request #6936 from jfoley/callbacksSantiago Pastorino2012-09-244-2/+78
|\ \ \ \ \
| * | | | | Add CHANGELOG entry and update the guideJohn Foley2012-09-232-0/+23
| * | | | | Switch to using include? on validation callbacksJohn Foley2012-09-231-2/+2
| * | | | | Fix collisions with before and after validation callbacks.John Foley2012-09-232-2/+55
* | | | | | Merge pull request #7742 from GRoguelon/masterSantiago Pastorino2012-09-241-1/+0
|\ \ \ \ \ \
| * | | | | | Remove of an extra line in template configuration file.Geoffrey Roguelon2012-09-241-1/+0
* | | | | | | make clear that expired db/schema_cache.dump are ignoredXavier Noria2012-09-241-1/+1
* | | | | | | adds the release notes for Rails 4.0 to the guides indexXavier Noria2012-09-241-0/+4
|/ / / / / /
* | | | | | Merge pull request #7741 from siong1987/testingVijay Dev2012-09-231-2/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [ci skip] Update Performance Testing guide.Teng Siong Ong2012-09-231-2/+1
|/ / / / /
* | | | | Merge pull request #7740 from BMorearty/dont-sort-paramsJosé Valim2012-09-232-2/+2
|\ \ \ \ \
| * | | | | Update test to match new non-sorting of attributes.Brian Morearty2012-09-231-1/+1
| * | | | | Removed sorting of attribute names in controller generator.Brian Morearty2012-09-231-1/+1
|/ / / / /
* | | | | Merge pull request #7737 from siong1987/debuggingVijay Dev2012-09-231-3/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | [ci skip] Update Debugging Rails Application guide.Teng Siong Ong2012-09-221-3/+1
* | | | | fixes the suite for uploaded filesXavier Noria2012-09-231-6/+6
|/ / / /
* | | | documents ActionDispatch::Http::UploadedFileXavier Noria2012-09-221-6/+55
* | | | Put the new CHANGELOG entries always in the top [ci skip]Rafael Mendonça França2012-09-221-8/+10
* | | | Merge pull request #7713 from porras/action-dispatch-upload-delegates-close-t...Xavier Noria2012-09-223-6/+16
|\ \ \ \
| * | | | Accept parameters in methods delegated to tempfileSergio Gil Pérez de la Manga2012-09-222-6/+8
| * | | | Update CHANGELOG.mdSergio Gil Pérez de la Manga2012-09-211-0/+2
| * | | | Delegate ActionDispatch::Http::UploadedFile#close to tempfileSergio Gil Pérez de la Manga2012-09-202-1/+7
* | | | | Fix test_find_in_batches_should_use_any_column_as_primary_keySantiago Pastorino2012-09-221-11/+8
* | | | | Merge pull request #7728 from guilleiguaran/fix-asset-testSantiago Pastorino2012-09-211-2/+5
|\ \ \ \ \
| * | | | | Update asset test to match one in sprockets-railsGuillermo Iguaran2012-09-211-2/+5
|/ / / / /
* | | | | Merge pull request #7726 from jcorcuera/masterSantiago Pastorino2012-09-213-3/+3
|\ \ \ \ \
| * | | | | Remove .rb from require sentencesJosé Corcuera Z2012-09-213-3/+3
* | | | | | Use debugger gem if we are not Travis and Ruby < 2.0Santiago Pastorino2012-09-211-1/+1
* | | | | | Add debugger to mri:test section of the GemfileSantiago Pastorino2012-09-211-0/+1
* | | | | | start could be a stringSantiago Pastorino2012-09-212-3/+3
| |_|/ / / |/| | | |
* | | | | Revert "Fix find_in_batches with customized primary_key"Santiago Pastorino2012-09-214-28/+11
* | | | | Raise the same exception the code is handlingSantiago Pastorino2012-09-211-1/+1
|/ / / /
* | | | Revert "update ActionMailer::Base documentation [ci skip]"Rafael Mendonça França2012-09-211-258/+216
* | | | Style: remove hash noiseJeremy Kemper2012-09-211-10/+10
* | | | Correct default charset/collation for mysql dbsJeremy Kemper2012-09-212-15/+30
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-223-67/+67
|\ \ \ \
| * | | | Update action_mailer_basics.md to ruby 1.9 syntax. [ci skip]José Corcuera2012-09-211-61/+61
| * | | | Update examples in action_controller_overview.md to ruby 1.9 syntax. [ci skip]José Corcuera2012-09-211-4/+4
| * | | | Update examples in AS::Concern to use correct scope syntax. [ci skip]José Corcuera2012-09-211-2/+2
* | | | | Use default charset/collation only if *neither* is specified. Otherwise we se...Jeremy Kemper2012-09-211-4/+7
* | | | | some edits in 4.0 release notes [ci skip]Vijay Dev2012-09-221-9/+10
* | | | | Fix typos and links in engines guide [ci skip]Vijay Dev2012-09-211-3/+2
* | | | | fix some md syntax errors and general revisions [ci skip]Vijay Dev2012-09-213-20/+19
|/ / / /