| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | | | |||||
| | * | | Fix indentation and update documentation for Array#wrap for Ruby 1.9 | Jo Liss | 2012-09-20 | 1 | -9/+10 |
| | | | | |||||
| | * | | fix :nodoc:s in AR::Timestamp [ci skip] | Francesco Rodriguez | 2012-09-19 | 1 | -7/+7 |
| | | | | |||||
| | * | | fix Hash#slice code example [ci skip] | Francesco Rodriguez | 2012-09-18 | 2 | -2/+2 |
| | | | | |||||
| | * | | Update 3.0 -> 3.1 session information. | Steve Klabnik | 2012-09-18 | 1 | -0/+13 |
| | | | | | | | | | | | | | Fixes #7685 | ||||
| | * | | Expanded note about poly associations. | Steve Klabnik | 2012-09-18 | 1 | -3/+12 |
| | | | | | | | | | | | | | Now with example! | ||||
| | * | | update ActionMailer documentation [ci skip] | Francesco Rodriguez | 2012-09-17 | 5 | -18/+15 |
| | | | | |||||
| | * | | Add note about inheretance and poly associations. | Steve Klabnik | 2012-09-17 | 1 | -0/+4 |
| | | | | | | | | | | | | | This note came about due to discussion in #6786. | ||||
| | * | | update ActionMailer::Base documentation [ci skip] | Francesco Rodriguez | 2012-09-17 | 1 | -266/+323 |
| | | | | |||||
| | * | | update code examples to 1.9 hash syntax in the AR/README [ci skip] | Francesco Rodriguez | 2012-09-17 | 1 | -12/+12 |
| | | | | |||||
| | * | | update AS docs [ci skip] | Francesco Rodriguez | 2012-09-17 | 23 | -329/+378 |
| | | | | |||||
| | * | | fix AS::OrderedOptions documentation [ci skip] | Francesco Rodriguez | 2012-09-17 | 1 | -16/+15 |
| | | | | |||||
| | * | | Update "Getting Started" guide | Simon Hengel | 2012-09-16 | 1 | -1/+1 |
| | | | | |||||
| | * | | Doc typo: depenent -> dependent; trailing ws. | Henrik N | 2012-09-16 | 1 | -2/+2 |
| | | | | |||||
| | * | | Improve documentation about :dependent and callbacks. | Steve Klabnik | 2012-09-15 | 1 | -0/+5 |
| | | | | | | | | | | | | | Fixes #3458. | ||||
| | * | | update AS/values and AS/xml_mini docs [ci skip] | Francesco Rodriguez | 2012-09-14 | 4 | -39/+54 |
| | | | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |