Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Change routes.rb look in getting started [ci skip] | Dmitry Pak | 2015-06-27 | 1 | -0/+1 |
| | |||||
* | Merge pull request #20417 from dubek/fix-template-cache-call-pattern | Kasper Timm Hansen | 2015-06-26 | 3 | -1/+36 |
|\ | | | | | Improve detection of partial templates eligible for collection caching. | ||||
| * | Improve detection of partial templates eligible for collection caching. | Dov Murik | 2015-06-22 | 3 | -1/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The regular expression which was used to detect partial templates that begin with a `<% cache ... do %>` call missed some cases. This commits attempts to improve the detection for some cases such as multi-line comments at the beginning of the template. The different templates are listed in two new unit test methods. Note that specially crafted Ruby code can still evade such `cache`-call detection: for example, a user might have its own method which itself calls the Rails `cache` helper. In such a case, the template's code doesn't start with a literal `cache` string and therefore will not be eligible for collection caching. | ||||
* | | Merge pull request #20708 from sikachu/update-pluck-suggestion | Zachary Scott | 2015-06-26 | 1 | -1/+1 |
|\ \ | | | | | | | Update .pluck documentation on uniq | ||||
| * | | Update .pluck documentation on uniq | Prem Sichanugrist | 2015-06-26 | 1 | -1/+1 |
|/ / | | | | | | | | | | | This is to show users that they can chain `.uniq` and `.pluck` to get the `DISTINCT column` result. They don't have to do `DISTINCT column` themselves. | ||||
* | | Merge pull request #20677 from jmondo/decimal-default-string | Sean Griffin | 2015-06-25 | 4 | -4/+9 |
|\ \ | | | | | | | Display decimal defaults as strings to keep precision | ||||
| * | | Display decimal defaults as strings to keep precision | John Gesimondo | 2015-06-23 | 4 | -4/+9 |
| | | | |||||
* | | | remove bad test. | Aaron Patterson | 2015-06-25 | 1 | -4/+0 |
| | | | |||||
* | | | Merge pull request #20697 from 5t111111/add-block-to-add_source | Guillermo Iguaran | 2015-06-25 | 4 | -2/+36 |
|\ \ \ | | | | | | | | | add_source in Application Template should take a block for gem entries | ||||
| * | | | cherry-pick test and source doc from #20050 | Hirofumi Wakasugi | 2015-06-25 | 3 | -0/+20 |
| | | | | |||||
| * | | | modify add_source in application template to take a block for gem entries | Hirofumi Wakasugi | 2015-06-25 | 1 | -2/+16 |
| | | | | |||||
* | | | | Add pending test for the great-grandparent touching bug from #19324 | David Heinemeier Hansson | 2015-06-25 | 6 | -0/+72 |
| | | | | |||||
* | | | | Merge pull request #20696 from ↵ | Yves Senn | 2015-06-25 | 1 | -11/+0 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | y-yagi/remove_active_resource_from_instrumentation_guide remove nonexistent hook from instrumentation guide [ci skip] | ||||
| * | | | remove nonexistent hook from instrumentation guide [ci skip] | yuuji.yaginuma | 2015-06-25 | 1 | -11/+0 |
|/ / / | |||||
* | | | Merge pull request #20681 from ivantsepp/update_rails_welcome_png | Rafael Mendonça França | 2015-06-24 | 1 | -0/+0 |
|\ \ \ | |/ / |/| | | Update rails_welcome.png | ||||
| * | | Update rails_welcome.png | Ivan Tse | 2015-06-24 | 1 | -0/+0 |
|/ / | | | | | | | [ci skip] | ||||
* | | Merge pull request #20674 from yui-knk/fix/guide2 | Rafael Mendonça França | 2015-06-23 | 1 | -1/+1 |
|\ \ | | | | | | | [ci skip] Make clear what `this method` is | ||||
| * | | [ci skip] Make clear what `this method` is | yui-knk | 2015-06-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this sentence, there are three candidates of `this method` * default_url_options * url_for * helper method(s) so make it clear. | ||||
* | | | A few documentation fixes [ci skip] | Robin Dupret | 2015-06-23 | 3 | -8/+8 |
| | | | |||||
* | | | Remove the paragraph about Rails::Server#middleware | Robin Dupret | 2015-06-23 | 1 | -18/+0 |
|/ / | | | | | | | | | | | | | | | | | | | | | As of 56903585, the Rack::ContentLength middleware isn't included by default anymore. The only remaining middleware is Rack::Lock ; since it's only included when using WEBrick, it's certainly not worth documenting it in the guides. [ci skip] | ||||
* | | Merge pull request #20673 from aditya-kapoor/correct-preload-doc | Yves Senn | 2015-06-23 | 1 | -1/+1 |
|\ \ | | | | | | | | | | [ci skip] correct for ActiveRecord::Associations::Preloader | ||||
| * | | [ci skip] correct for ActiveRecord::Associations::Preloader: | Aditya Kapoor | 2015-06-23 | 1 | -1/+2 |
| | | | |||||
* | | | docs, add missing closing bracket. [ci skip] | Yves Senn | 2015-06-23 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #20552 from jamesdabbs/belongs-to-polymorphic-force-reload | Yves Senn | 2015-06-23 | 3 | -1/+10 |
|\ \ | | | | | | | | | | Fix `undefined method uncached` for polymorphic belongs_to #20426 | ||||
| * | | Fix `undefined method uncached` for polymorphic belongs_to #20426 | James Dabbs | 2015-06-13 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | Unitialized polymorphic `belongs_to` associations raise an error while attempting to reload, as they attempt to make an uncached reload, but don't have a klass to fetch uncachedly. In this case, `loaded?` should be `false` anyway. | ||||
* | | | Merge pull request #20545 from dcrec1/20541 | Yves Senn | 2015-06-23 | 3 | -3/+39 |
|\ \ \ | | | | | | | | | | | | | thrown ActiveRecord::AssociationTypeMismatch when assigning a wrong value for a namespaced association | ||||
| * | | | thrown ActiveRecord::AssociationTypeMismatch when assigning a wrong value ↵ | Diego Carrion | 2015-06-22 | 3 | -3/+31 |
| | | | | | | | | | | | | | | | | | | | | for a namespaced association fixes #20541 | ||||
* | | | | Merge pull request #20667 from y-yagi/do_not_show_failed_messages | Rafael Mendonça França | 2015-06-22 | 2 | -3/+10 |
|\ \ \ \ | | | | | | | | | | | do not show "Failed tests" message when a failed test is not | ||||
| * | | | | do not show "Failed tests" message when a failed test is not | yuuji.yaginuma | 2015-06-23 | 2 | -3/+10 |
| | | | | | |||||
* | | | | | Merge pull request #20664 from vngrs/remove_mistaken_end_from_doc | Claudio B. | 2015-06-22 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove mistaken end from controller_path doc [ci skip] | ||||
| * | | | | | Remove mistaken end from controller_path doc [ci skip] | Mehmet Emin İNAÇ | 2015-06-22 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #19431 from hmarr/head-routing | Rafael Mendonça França | 2015-06-22 | 2 | -4/+4 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Respect routing precedence for HEAD requests | ||||
| * | | | | Respect routing precedence for HEAD requests | Harry Marr | 2015-03-20 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the issue described in #18764 - prevents Rack middleware from swallowing up HEAD requests that should have been matched by a higher-precedence `get` route, but still allows Rack middleware to respond to HEAD requests. | ||||
* | | | | | Merge pull request #20665 from vngrs/add_nodoc_to_validations_helpers | Rafael Mendonça França | 2015-06-22 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Add nodoc to the Validations::Helpers [ci skip] | ||||
| * | | | | | Add nodoc to the Validations::Helpers [ci skip] | Mehmet Emin İNAÇ | 2015-06-22 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #20663 from andreynering/patch-1 | Rafael Mendonça França | 2015-06-22 | 1 | -2/+2 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Minor fixes [ci skip] | ||||
| * | | | | Minor fixes [ci skip] | Andrey Nering | 2015-06-22 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | docs, :scissors: wrongly placed heading. [ci skip] | Yves Senn | 2015-06-22 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | The heading "Active Model Length Validator" was shown on the "ActiveModel::Validations" page without any text following it. | ||||
* | | | | refactor, don't duplicate presence validator logic. | Yves Senn | 2015-06-22 | 1 | -10/+4 |
| | | | | | | | | | | | | | | | | | | | | This is a small refactoring that simplifies the Active Record specific lenght validator. | ||||
* | | | | docs, update Active Model reference for AR length validator. [ci skip] | Yves Senn | 2015-06-22 | 1 | -1/+4 |
| | | | | |||||
* | | | | AR absence validator respects `marked_for_destruction?`. Closes #20449. | Yves Senn | 2015-06-22 | 4 | -0/+106 |
| |/ / |/| | | | | | | | | Associated objects that were marked for destruction are considered absent. | ||||
* | | | Merge pull request #20656 from repinel/move-validations-helper-methods | Yves Senn | 2015-06-22 | 2 | -10/+13 |
|\ \ \ | | | | | | | | | Move the validations HelperMethods to its own file | ||||
| * | | | Move the validations HelperMethods to its own file | Roque Pinel | 2015-06-21 | 2 | -10/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | Closes #11209 [Roque Pinel & Steven Yang] | ||||
* | | | | Merge pull request #20659 from ↵ | Yves Senn | 2015-06-22 | 1 | -2/+4 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | vngrs/strong_parameters_unpermitted_parameters_wrong_doc_fix Fix the documentation about ActionController::UnpermittedParameters [ci skip] | ||||
| * | | | | Fix the documentation about ActionController::UnpermittedParameters [ci skip] | Mehmet Emin İNAÇ | 2015-06-22 | 1 | -2/+4 |
|/ / / / | |||||
* | | | | Merge pull request #20655 from y-yagi/remove_unused_variable | Richard Schneeman | 2015-06-21 | 1 | -1/+0 |
|\ \ \ \ | | | | | | | | | | | remove unused variable in reporter test | ||||
| * | | | | remove unused variable in reporter test | yuuji.yaginuma | 2015-06-22 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | Merge pull request #20658 from vngrs/strong_parameters_parameter_wrong_doc_fix | Richard Schneeman | 2015-06-21 | 1 | -5/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix the documentation about ActionController::ParameterMissing [ci skip] | ||||
| * | | | | | Fix the documentation about ActionController::ParameterMissing [ci skip] | Mehmet Emin İNAÇ | 2015-06-22 | 1 | -5/+5 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #20654 from repinel/remove-duplicate-private | Richard Schneeman | 2015-06-21 | 1 | -2/+0 |
|\ \ \ \ \ | |/ / / / |/| | | | | Remove duplicate private statement |