| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | | | 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 | |||||
| * | | | | | | | Revert "Fix find_in_batches with customized primary_key" | Santiago Pastorino | 2012-09-21 | 4 | -28/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 761bc751d31c22e2c2fdae2b4cdd435b68b6d783. This commit wasn't fixing any issue just using the same table for different models with different primary keys. | |||||
| * | | | | | | | Raise the same exception the code is handling | Santiago Pastorino | 2012-09-21 | 1 | -1/+1 | |
| |/ / / / / / | ||||||
| * | | | | | | Revert "update ActionMailer::Base documentation [ci skip]" | Rafael Mendonça França | 2012-09-21 | 1 | -258/+216 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f5654e78b248ecc90e8556366c927e1176c2428f. Conflicts: actionmailer/lib/action_mailer/base.rb Reason: @frodsan asked me to revert since this change is breaking the documentation in the edge API site | |||||
| * | | | | | | Style: remove hash noise | Jeremy Kemper | 2012-09-21 | 1 | -10/+10 | |
| | | | | | | | ||||||
| * | | | | | | Correct default charset/collation for mysql dbs | Jeremy Kemper | 2012-09-21 | 2 | -15/+30 | |
| | |_|_|/ / |/| | | | | ||||||
| * | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-09-22 | 3 | -67/+67 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Update action_mailer_basics.md to ruby 1.9 syntax. [ci skip] | José Corcuera | 2012-09-21 | 1 | -61/+61 | |
| | | | | | | | ||||||
| | * | | | | | Update examples in action_controller_overview.md to ruby 1.9 syntax. [ci skip] | José Corcuera | 2012-09-21 | 1 | -4/+4 | |
| | | | | | | | ||||||
| | * | | | | | Update examples in AS::Concern to use correct scope syntax. [ci skip] | José Corcuera | 2012-09-21 | 1 | -2/+2 | |
| | | | | | | | ||||||
| * | | | | | | Use default charset/collation only if *neither* is specified. Otherwise we ↵ | Jeremy Kemper | 2012-09-21 | 1 | -4/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | set utf8_unicode_ci collation on latin1 table. | |||||
| * | | | | | | some edits in 4.0 release notes [ci skip] | Vijay Dev | 2012-09-22 | 1 | -9/+10 | |
| | | | | | | | ||||||
| * | | | | | | Fix typos and links in engines guide [ci skip] | Vijay Dev | 2012-09-21 | 1 | -3/+2 | |
| | | | | | | | ||||||
| * | | | | | | fix some md syntax errors and general revisions [ci skip] | Vijay Dev | 2012-09-21 | 3 | -20/+19 | |
| |/ / / / / | ||||||
| * | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-09-21 | 95 | -1174/+1339 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/configurable.rb activesupport/lib/active_support/core_ext/module/deprecation.rb guides/source/action_controller_overview.md guides/source/active_support_core_extensions.md guides/source/ajax_on_rails.textile guides/source/association_basics.textile guides/source/upgrading_ruby_on_rails.md While resolving conflicts, I have chosen to ignore changes done in docrails at some places - these will be most likely 1.9 hash syntax changes. | |||||
| | * | | | | | remove nodoc [ci skip] | Vijay Dev | 2012-09-21 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | * | | | | | Updated description of what engines are used for | Stephan Hagemann | 2012-09-21 | 1 | -2/+2 | |
| | | | | | | | ||||||
| | * | | | | | Revert "Fix MIME type in CHANGELOG" | Jo Liss | 2012-09-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CHANGELOG edits do not belongs on docrails, so I'll send a pull request instead. Thanks @rafaelfranca for catching this. This reverts commit 84c9491eab5b9f7c4250ca4c2ca5d763e8c4ff4d. | |||||
| | * | | | | | Fix MIME type in CHANGELOG | Jo Liss | 2012-09-21 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | * | | | | | Add extra note about :dependent => :destroy. | Steve Klabnik | 2012-09-21 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Callbacks may interfere with each other. | |||||
| | * | | | | | correct a typo | Przemek Hocke | 2012-09-21 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | * | | | | | Add missing "m" char | Przemek Hocke | 2012-09-21 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | * | | | | | fix two typos in the associations guide | Przemek Hocke | 2012-09-21 | 1 | -2/+2 | |
| | | | | | | | ||||||
| | * | | | | | fix a small typo | Przemek Hocke | 2012-09-21 | 1 | -1/+1 | |
| | | | | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Eilertsens Kodeknekkeri |
| aboutsummaryrefslogtreecommitdiffstats |