aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Use plaform mri_19 for debugger gem"Aaron Patterson2012-09-251-6/+1
* Merge pull request #7759 from blowmage/minitestAaron Patterson2012-09-252-4/+3
|\
| * Add missing inflector dependencyMike Moore2012-09-252-4/+3
* | Fix destructive side effects from marshaling an association caused by 65843e1...Jeremy Kemper2012-09-252-7/+7
* | Merge pull request #7757 from yahonda/skip_non_supported_isolation_levelRafael Mendonça França2012-09-251-2/+6
|\ \
| * | Skip tests for non-supported isolation levelsYasuo Honda2012-09-261-2/+6
* | | Use plaform mri_19 for debugger gemSantiago Pastorino2012-09-251-1/+6
|/ /
* | Merge pull request #7756 from yahonda/isolation_level_oracleRafael Mendonça França2012-09-251-0/+2
|\ \
| * | Skip tests for non-supported isolation levels with OracleYasuo Honda2012-09-251-0/+2
* | | Merge pull request #7754 from NARKOZ/image_tag-sizeRafael Mendonça França2012-09-253-6/+12
|\ \ \
| * | | change ^ and $ anchors in regexp to \A and \z respectivelyNihad Abbasov2012-09-251-1/+1
| * | | allow to pass numerical value to size option in image_tagNihad Abbasov2012-09-253-5/+11
|/ / /
* | | Merge pull request #7749 from blowmage/minitestAaron Patterson2012-09-2516-11/+726
|\ \ \ | |/ / |/| / | |/
| * Register AD::IntegrationTest for minitest's spec DSLMike Moore2012-09-242-0/+44
| * Support helper tests using spec DSLMike Moore2012-09-243-5/+60
| * Register helper and view tests for minitest's spec DSLMike Moore2012-09-242-0/+42
| * Support mailer tests using spec DSLMike Moore2012-09-242-3/+149
| * Register mailer tests for minitest's spec DSLMike Moore2012-09-242-0/+44
| * Add register_spec_type test coverageMike Moore2012-09-241-0/+23
| * Allow strings in the controller test describe blocksMike Moore2012-09-243-0/+130
| * Support controller tests using spec DSL - fixes #7743Mike Moore2012-09-242-3/+121
| * Create ActiveSupport::Testing::ConstantLookupMike Moore2012-09-243-0/+113
* | 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