Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7754 from NARKOZ/image_tag-size | Rafael Mendonça França | 2012-09-25 | 3 | -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 respectively | Nihad Abbasov | 2012-09-25 | 1 | -1/+1 |
| | | | | | | | | http://guides.rubyonrails.org/security.html#regular-expressions | ||||
| * | allow to pass numerical value to size option in image_tag | Nihad Abbasov | 2012-09-25 | 3 | -5/+11 |
|/ | | | | | This will set image's both width and height attributes to value passed in size option. | ||||
* | Merge pull request #7749 from blowmage/minitest | Aaron Patterson | 2012-09-25 | 16 | -11/+726 |
|\ | | | | | Improve support for minitest's spec DSL | ||||
| * | Register AD::IntegrationTest for minitest's spec DSL | Mike Moore | 2012-09-24 | 2 | -0/+44 |
| | | |||||
| * | Support helper tests using spec DSL | Mike Moore | 2012-09-24 | 3 | -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 DSL | Mike Moore | 2012-09-24 | 2 | -0/+42 |
| | | |||||
| * | Support mailer tests using spec DSL | Mike Moore | 2012-09-24 | 2 | -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 DSL | Mike Moore | 2012-09-24 | 2 | -0/+44 |
| | | |||||
| * | Add register_spec_type test coverage | Mike Moore | 2012-09-24 | 1 | -0/+23 |
| | | |||||
| * | Allow strings in the controller test describe blocks | Mike Moore | 2012-09-24 | 3 | -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 #7743 | Mike Moore | 2012-09-24 | 2 | -3/+121 |
| | | | | | | | | Add tests for controller tests using the minitest spec DSL. | ||||
| * | Create ActiveSupport::Testing::ConstantLookup | Mike Moore | 2012-09-24 | 3 | -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_request | Rafael Mendonça França | 2012-09-25 | 4 | -8/+24 |
|\ \ | | | | | | | remove unused Mime::Type#verify_request? | ||||
| * | | depreacte unused Mime::Type#verify_request? and ↵ | grosser | 2012-09-24 | 4 | -8/+24 |
| | | | | | | | | | | | | Mime::Type.browser_generated_types | ||||
* | | | some copy-editing I did in passing | Xavier Noria | 2012-09-25 | 1 | -26/+28 |
| | | | |||||
* | | | gives credit to Aaron in the CHANGELOG entry for AC::Live | Xavier Noria | 2012-09-25 | 1 | -2/+4 |
| | | | |||||
* | | | Merge pull request #7727 from frodsan/security_guide_sp | Rafael Mendonça França | 2012-09-24 | 1 | -58/+79 |
|\ \ \ | | | | | | | | | update Security guide with StrongParameters documentation | ||||
| * | | | update Security guide to reflect mass assignment protection with ↵ | Francesco Rodriguez | 2012-09-24 | 1 | -58/+79 |
| | | | | | | | | | | | | | | | | StrongParameters [ci skip] | ||||
* | | | | Only apply log tags if the logger supports it | Jeremy Kemper | 2012-09-24 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Merge pull request #6936 from jfoley/callbacks | Santiago Pastorino | 2012-09-24 | 4 | -2/+78 |
|\ \ \ | | | | | | | | | Fix collisions with before and after validation callbacks. | ||||
| * | | | Add CHANGELOG entry and update the guide | John Foley | 2012-09-23 | 2 | -0/+23 |
| | | | | |||||
| * | | | Switch to using include? on validation callbacks | John Foley | 2012-09-23 | 1 | -2/+2 |
| | | | | |||||
| * | | | Fix collisions with before and after validation callbacks. | John Foley | 2012-09-23 | 2 | -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/master | Santiago Pastorino | 2012-09-24 | 1 | -1/+0 |
|\ \ \ \ | | | | | | | | | | | Deletion of an extra blank line in configuration template file | ||||
| * | | | | Remove of an extra line in template configuration file. | Geoffrey Roguelon | 2012-09-24 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | make clear that expired db/schema_cache.dump are ignored | Xavier Noria | 2012-09-24 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | adds the release notes for Rails 4.0 to the guides index | Xavier Noria | 2012-09-24 | 1 | -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/testing | Vijay Dev | 2012-09-23 | 1 | -2/+1 |
|\ \ \ \ | |/ / / |/| | | | [ci skip] Update Performance Testing guide. | ||||
| * | | | [ci skip] Update Performance Testing guide. | Teng Siong Ong | 2012-09-23 | 1 | -2/+1 |
|/ / / | | | | | | | | | | - remove Palmist which is no longer available. - update link to Query Reviewer. | ||||
* | | | Merge pull request #7740 from BMorearty/dont-sort-params | José Valim | 2012-09-23 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | Removed sorting of attribute names in controller generator. | ||||
| * | | | Update test to match new non-sorting of attributes. | Brian Morearty | 2012-09-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | Removed sorting of attribute names in controller generator. | Brian Morearty | 2012-09-23 | 1 | -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/debugging | Vijay Dev | 2012-09-23 | 1 | -3/+1 |
|\ \ \ | |_|/ |/| | | Update Debugging Rails Application guide. | ||||
| * | | [ci skip] Update Debugging Rails Application guide. | Teng Siong Ong | 2012-09-22 | 1 | -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 files | Xavier Noria | 2012-09-23 | 1 | -6/+6 |
|/ / | |||||
* | | documents ActionDispatch::Http::UploadedFile | Xavier Noria | 2012-09-22 | 1 | -6/+55 |
| | | |||||
* | | Put the new CHANGELOG entries always in the top [ci skip] | Rafael Mendonça França | 2012-09-22 | 1 | -8/+10 |
| | | |||||
* | | Merge pull request #7713 from ↵ | Xavier Noria | 2012-09-22 | 3 | -6/+16 |
|\ \ | | | | | | | | | | | | | porras/action-dispatch-upload-delegates-close-to-tempfile Delegate ActionDispatch::Http::UploadedFile#close to tempfile | ||||
| * | | Accept parameters in methods delegated to tempfile | Sergio Gil Pérez de la Manga | 2012-09-22 | 2 | -6/+8 |
| | | | |||||
| * | | Update CHANGELOG.md | Sergio Gil Pérez de la Manga | 2012-09-21 | 1 | -0/+2 |
| | | | |||||
| * | | Delegate ActionDispatch::Http::UploadedFile#close to tempfile | Sergio Gil Pérez de la Manga | 2012-09-20 | 2 | -1/+7 |
| | | | |||||
* | | | Fix test_find_in_batches_should_use_any_column_as_primary_key | Santiago Pastorino | 2012-09-22 | 1 | -11/+8 |
| | | | |||||
* | | | Merge pull request #7728 from guilleiguaran/fix-asset-test | Santiago Pastorino | 2012-09-21 | 1 | -2/+5 |
|\ \ \ | | | | | | | | | Update asset test to match one in sprockets-rails | ||||
| * | | | Update asset test to match one in sprockets-rails | Guillermo Iguaran | 2012-09-21 | 1 | -2/+5 |
|/ / / | |||||
* | | | Merge pull request #7726 from jcorcuera/master | Santiago Pastorino | 2012-09-21 | 3 | -3/+3 |
|\ \ \ | | | | | | | | | Remove '.rb' from require sentences | ||||
| * | | | Remove .rb from require sentences | José Corcuera Z | 2012-09-21 | 3 | -3/+3 |
| | | | | |||||
* | | | | Use debugger gem if we are not Travis and Ruby < 2.0 | Santiago Pastorino | 2012-09-21 | 1 | -1/+1 |
| | | | | |||||
* | | | | Add debugger to mri:test section of the Gemfile | Santiago Pastorino | 2012-09-21 | 1 | -0/+1 |
| | | | | |||||
* | | | | start could be a string | Santiago Pastorino | 2012-09-21 | 2 | -3/+3 |
| |_|/ |/| | | | | | | | | | | | Related to 761bc751d31c22e2c2fdae2b4cdd435b68b6d783 and eb876c4d07130f15be2cac7be968cc393f959c62 |