aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7754 from NARKOZ/image_tag-sizeRafael Mendonça França2012-09-253-6/+12
|\ | | | | Feature: set the same width and height for image if size attribute is a number
| * change ^ and $ anchors in regexp to \A and \z respectivelyNihad Abbasov2012-09-251-1/+1
| | | | | | | | http://guides.rubyonrails.org/security.html#regular-expressions
| * allow to pass numerical value to size option in image_tagNihad Abbasov2012-09-253-5/+11
|/ | | | | This will set image's both width and height attributes to value passed in size option.
* Merge pull request #7749 from blowmage/minitestAaron Patterson2012-09-2516-11/+726
|\ | | | | Improve support for minitest's spec DSL
| * Register AD::IntegrationTest for minitest's spec DSLMike Moore2012-09-242-0/+44
| |
| * Support helper tests using spec DSLMike Moore2012-09-243-5/+60
| | | | | | | | | | Improve how helper tests to resolve the helper class from the test name. Add tests for helper tests using the minitest spec DSL.
| * 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
| | | | | | | | | | Improve how mailer tests to resolve mailers from the test name. Add tests for mailer tests using the minitest spec DSL.
| * 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
| | | | | | | | | | Allow controller tests using the spec DSL to match strings. Add test coverage for the register_spec_type calls.
| * Support controller tests using spec DSL - fixes #7743Mike Moore2012-09-242-3/+121
| | | | | | | | Add tests for controller tests using the minitest spec DSL.
| * Create ActiveSupport::Testing::ConstantLookupMike Moore2012-09-243-0/+113
| | | | | | | | | | AS::TC::ConstantLookup walks the test's name to find the constant it is describing. This additional lookup logic is needed to better support minitest's spec DSL.
* | Merge pull request #7738 from grosser/verified_requestRafael Mendonça França2012-09-254-8/+24
|\ \ | | | | | | remove unused Mime::Type#verify_request?
| * | depreacte unused Mime::Type#verify_request? and ↵grosser2012-09-244-8/+24
| | | | | | | | | | | | Mime::Type.browser_generated_types
* | | 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 with StrongParameters documentation
| * | | update Security guide to reflect mass assignment protection with ↵Francesco Rodriguez2012-09-241-58/+79
| | | | | | | | | | | | | | | | StrongParameters [ci skip]
* | | | 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
|\ \ \ | | | | | | | | Fix collisions with before and after validation callbacks.
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | This commit allows a user to do something like: before_validation :do_stuff, :on => [ :create, :update ] after_validation :do_more, :on => [ :create, :update ]
* | | | Merge pull request #7742 from GRoguelon/masterSantiago Pastorino2012-09-241-1/+0
|\ \ \ \ | | | | | | | | | | Deletion of an extra blank line in configuration template file
| * | | | 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
|/ / / / | | | | | | | | | | | | | | | | This is still an early draft, but let's add it to the index to have it ready.
* | | | Merge pull request #7741 from siong1987/testingVijay Dev2012-09-231-2/+1
|\ \ \ \ | |/ / / |/| | | [ci skip] Update Performance Testing guide.
| * | | [ci skip] Update Performance Testing guide.Teng Siong Ong2012-09-231-2/+1
|/ / / | | | | | | | | | - remove Palmist which is no longer available. - update link to Query Reviewer.
* | | Merge pull request #7740 from BMorearty/dont-sort-paramsJosé Valim2012-09-232-2/+2
|\ \ \ | | | | | | | | Removed sorting of attribute names in controller generator.
| * | | 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
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I believe when people use generators, they typically order the parameters on the command line in an order that makes sense to them. Sorting them in the generated code makes the order seem more arbitrary to humans, even though it's less arbitrary to computers. :-) Example: rails g scaffold Post title:string content:text The human chose to put title before content. Sorted attributes in the generated code work but don't match the human's intent: params.require(:posts).permit(:content, :title)
* | | Merge pull request #7737 from siong1987/debuggingVijay Dev2012-09-231-3/+1
|\ \ \ | |_|/ |/| | Update Debugging Rails Application guide.
| * | [ci skip] Update Debugging Rails Application guide.Teng Siong Ong2012-09-221-3/+1
| | | | | | | | | | | | | | | | | | - remove query_stats plugin reference in debugging guide since it is no longer maintained. - remove exception_logger plugin reference in debugging guide since it is no longer maintained. - update query_reviewer url to the latest one on github.
* | | 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 ↵Xavier Noria2012-09-223-6/+16
|\ \ | | | | | | | | | | | | porras/action-dispatch-upload-delegates-close-to-tempfile Delegate ActionDispatch::Http::UploadedFile#close to tempfile
| * | 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-rails
| * | | 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 sentences
| * | | 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
| |_|/ |/| | | | | | | | | | | Related to 761bc751d31c22e2c2fdae2b4cdd435b68b6d783 and eb876c4d07130f15be2cac7be968cc393f959c62