aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* To fix #20644Srikanth Shreenivas2015-06-301-1/+2
| | | Added a note on development kit for Windows Users. This is required as Windows users can get frustrated when their first rails project creation would fail as some native gem won't get built.
* Merge pull request #20677 from jmondo/decimal-default-stringSean Griffin2015-06-254-4/+9
|\ | | | | Display decimal defaults as strings to keep precision
| * Display decimal defaults as strings to keep precisionJohn Gesimondo2015-06-234-4/+9
| |
* | remove bad test.Aaron Patterson2015-06-251-4/+0
| |
* | Merge pull request #20697 from 5t111111/add-block-to-add_sourceGuillermo Iguaran2015-06-254-2/+36
|\ \ | | | | | | add_source in Application Template should take a block for gem entries
| * | cherry-pick test and source doc from #20050Hirofumi Wakasugi2015-06-253-0/+20
| | |
| * | modify add_source in application template to take a block for gem entriesHirofumi Wakasugi2015-06-251-2/+16
| | |
* | | Add pending test for the great-grandparent touching bug from #19324David Heinemeier Hansson2015-06-256-0/+72
| | |
* | | Merge pull request #20696 from ↵Yves Senn2015-06-251-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.yaginuma2015-06-251-11/+0
|/ /
* | Merge pull request #20681 from ivantsepp/update_rails_welcome_pngRafael Mendonça França2015-06-241-0/+0
|\ \ | |/ |/| Update rails_welcome.png
| * Update rails_welcome.pngIvan Tse2015-06-241-0/+0
|/ | | | [ci skip]
* Merge pull request #20674 from yui-knk/fix/guide2Rafael Mendonça França2015-06-231-1/+1
|\ | | | | [ci skip] Make clear what `this method` is
| * [ci skip] Make clear what `this method` isyui-knk2015-06-241-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 Dupret2015-06-233-8/+8
| |
* | Remove the paragraph about Rails::Server#middlewareRobin Dupret2015-06-231-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-docYves Senn2015-06-231-1/+1
|\ | | | | | | [ci skip] correct for ActiveRecord::Associations::Preloader
| * [ci skip] correct for ActiveRecord::Associations::Preloader:Aditya Kapoor2015-06-231-1/+2
| |
* | docs, add missing closing bracket. [ci skip]Yves Senn2015-06-231-1/+1
|/
* Merge pull request #20552 from jamesdabbs/belongs-to-polymorphic-force-reloadYves Senn2015-06-233-1/+10
|\ | | | | | | Fix `undefined method uncached` for polymorphic belongs_to #20426
| * Fix `undefined method uncached` for polymorphic belongs_to #20426James Dabbs2015-06-132-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/20541Yves Senn2015-06-233-3/+39
|\ \ | | | | | | | | | thrown ActiveRecord::AssociationTypeMismatch when assigning a wrong value for a namespaced association
| * | thrown ActiveRecord::AssociationTypeMismatch when assigning a wrong value ↵Diego Carrion2015-06-223-3/+31
| | | | | | | | | | | | | | | for a namespaced association fixes #20541
* | | Merge pull request #20667 from y-yagi/do_not_show_failed_messagesRafael Mendonça França2015-06-222-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 notyuuji.yaginuma2015-06-232-3/+10
| | | |
* | | | Merge pull request #20664 from vngrs/remove_mistaken_end_from_docClaudio B.2015-06-221-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-221-1/+1
| | |/ / | |/| |
* | | | Merge pull request #19431 from hmarr/head-routingRafael Mendonça França2015-06-222-4/+4
|\ \ \ \ | | | | | | | | | | Respect routing precedence for HEAD requests
| * | | | Respect routing precedence for HEAD requestsHarry Marr2015-03-202-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_helpersRafael Mendonça França2015-06-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Add nodoc to the Validations::Helpers [ci skip]
| * | | | | Add nodoc to the Validations::Helpers [ci skip]Mehmet Emin İNAÇ2015-06-221-1/+1
|/ / / / /
* | | | | Merge pull request #20663 from andreynering/patch-1Rafael Mendonça França2015-06-221-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | | Minor fixes [ci skip]
| * | | | Minor fixes [ci skip]Andrey Nering2015-06-221-2/+2
|/ / / /
* | | | docs, :scissors: wrongly placed heading. [ci skip]Yves Senn2015-06-221-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 Senn2015-06-221-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 Senn2015-06-221-1/+4
| | | |
* | | | AR absence validator respects `marked_for_destruction?`. Closes #20449.Yves Senn2015-06-224-0/+106
| |/ / |/| | | | | | | | Associated objects that were marked for destruction are considered absent.
* | | Merge pull request #20656 from repinel/move-validations-helper-methodsYves Senn2015-06-222-10/+13
|\ \ \ | | | | | | | | Move the validations HelperMethods to its own file
| * | | Move the validations HelperMethods to its own fileRoque Pinel2015-06-212-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | Closes #11209 [Roque Pinel & Steven Yang]
* | | | Merge pull request #20659 from ↵Yves Senn2015-06-221-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-221-2/+4
|/ / / /
* | | | Merge pull request #20655 from y-yagi/remove_unused_variableRichard Schneeman2015-06-211-1/+0
|\ \ \ \ | | | | | | | | | | remove unused variable in reporter test
| * | | | remove unused variable in reporter testyuuji.yaginuma2015-06-221-1/+0
| | | | |
* | | | | Merge pull request #20658 from vngrs/strong_parameters_parameter_wrong_doc_fixRichard Schneeman2015-06-211-5/+5
|\ \ \ \ \ | | | | | | | | | | | | Fix the documentation about ActionController::ParameterMissing [ci skip]
| * | | | | Fix the documentation about ActionController::ParameterMissing [ci skip]Mehmet Emin İNAÇ2015-06-221-5/+5
| | |/ / / | |/| | |
* | | | | Merge pull request #20654 from repinel/remove-duplicate-privateRichard Schneeman2015-06-211-2/+0
|\ \ \ \ \ | |/ / / / |/| | | | Remove duplicate private statement
| * | | | Remove duplicate private statementRoque Pinel2015-06-211-2/+0
| | | | |
* | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-06-218-11/+9
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Conflicts: guides/source/configuring.md
| * | | | Remove broken linksGaurish Sharma2015-06-211-2/+0
| | | | | | | | | | | | | | | [ci skip]
| * | | | [ci skip] Fix to Fixed-width Fontyui-knk2015-06-143-4/+4
| | | | | | | | | | | | | | | | | | | | LookupContext is class name