aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #18261 from prathamesh-sonpatki/update-changelogRafael Mendonça França2014-12-301-3/+4
|\
| * Update CHANGELOG entry for #18070 [ci skip]Prathamesh Sonpatki2014-12-311-3/+4
|/
* Merge pull request #18259 from arthurnn/return_nil_on_multi_pkSean Griffin2014-12-306-8/+33
|\
| * Ensures that primary_key method will return nil when multi-pkArthur Neves2014-12-306-8/+33
* | Add implement integration test to Testing Guide. [ci skip]Zachary Scott2014-12-301-0/+75
* | Replace exhaustive list of helper methods with pointers to helper classes foundZachary Scott2014-12-301-16/+7
* | Remove this line which was added by accident [ci skip]Zachary Scott2014-12-301-2/+0
* | Merge pull request #18256 from rohit/secure-password-tweakRafael Mendonça França2014-12-301-1/+1
|\ \
| * | Use more semantic method to check passwordRohit Arondekar2014-12-301-1/+1
* | | Merge pull request #18258 from prathamesh-sonpatki/fix-application-name-descr...Rafael Mendonça França2014-12-301-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix description for application_name method - change simple to simplyPrathamesh Sonpatki2014-12-301-1/+1
* | | Tiny documentation fixes [ci skip]Robin Dupret2014-12-302-4/+5
* | | Merge pull request #18130 from claudiob/better-record-identifier-docRobin Dupret2014-12-301-18/+42
|\ \ \
| * | | Better docs for AV::RecordIdentifierclaudiob2014-12-231-18/+42
* | | | Merge pull request #18255 from prathamesh-sonpatki/fix-single-space-for-headRafael Mendonça França2014-12-303-5/+17
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove single space response body for head requestPrathamesh Sonpatki2014-12-303-5/+17
|/ / /
* | | Merge pull request #18251 from tjgrathwell/fix-polymorphic-routes-to-modelRafael Mendonça França2014-12-303-10/+25
|\ \ \
| * | | Fix form_for to work with objects that implement to_modelTravis Grathwell2014-12-292-10/+21
* | | | AR specific length validator to respect `marked_for_destruction`.Yves Senn2014-12-305-0/+49
| |_|/ |/| |
* | | Template lookup now respect default locale and I18n fallbacks.Rafael Mendonça França2014-12-296-11/+52
* | | Move Rake tasks list to a smaller heading section earlier in the guide.Zachary Scott2014-12-291-21/+21
* | | Condense notes regarding Minitest and its available assertions removed in:Zachary Scott2014-12-291-38/+19
* | | Remove redundant information about Minitest, which is already covered whenZachary Scott2014-12-291-8/+0
|/ /
* | Move longer form example from integration guide to api reference, below anZachary Scott2014-12-292-74/+78
* | Grammar pass through Integration Testing section [ci skip]Zachary Scott2014-12-291-3/+3
* | fix error message of option as with invalid charters in partial renderingAngelo capilleri2014-12-293-5/+32
* | Merge branch 'master' of github.com:rails/rails [ci skip]Zachary Scott2014-12-291-0/+8
|\ \
| * \ Merge pull request #18249 from claudiob/add-doc-for-save-with-touchRafael Mendonça França2014-12-291-0/+8
| |\ \
| | * | Add doc for `:touch` option of AR::Base#saveclaudiob2014-12-301-0/+8
* | | | Remove pre-4.2 comment about missing `assert_select` [ci skip]Zachary Scott2014-12-291-2/+0
* | | | Update link to rails-dom-testing documentation [ci skip]Zachary Scott2014-12-291-1/+1
* | | | Pass through `assert_select` testing guide [ci skip]Zachary Scott2014-12-291-4/+9
|/ / /
* | | Implement testing `flash` notices into our blog app [ci skip]Zachary Scott2014-12-291-3/+62
* | | Pass through Testing Templates and Layouts section [ci skip]Zachary Scott2014-12-291-11/+13
* | | These are technically objects [ci skip]Zachary Scott2014-12-291-2/+2
* | | Rephrase Four Hashes of the Apocalypse [ci skip]Zachary Scott2014-12-291-1/+1
|/ /
* | Compare http request type with test equivalent methods, and application use-c...Zachary Scott2014-12-291-2/+2
* | Merge pull request #18246 from aprescott/document-include_all_helpers-settingRafael Mendonça França2014-12-291-0/+2
|\ \
| * | Document the include_all_helpers config setting.Adam Prescott2014-12-291-0/+2
* | | Merge pull request #18244 from cristianbica/remove-object-itselfRafael Mendonça França2014-12-293-25/+0
|\ \ \ | |/ / |/| |
| * | Removed Object#itself as it's implemented in ruby 2.2Cristian Bica2014-12-293-25/+0
* | | Rephrase functional testing in its relation to Rails Controller Unit Testing.Zachary Scott2014-12-291-1/+1
|/ /
* | Merge pull request #18243 from JoshCheek/mailer_guide_code_exampleCarlos Antonio da Silva2014-12-291-1/+3
|\ \
| * | Un-inline if statementJosh Cheek2014-12-291-1/+3
|/ /
* | Merge pull request #18240 from shunsukeaida/add_tzinfo_data_to_plugin_gemfileRafael Mendonça França2014-12-291-0/+4
|\ \
| * | plugin's gemfile also needs tzinfo-data in WindowsShunsukeAida2014-12-301-0/+4
* | | Remove some warning with Ruby 2.2Rafael Mendonça França2014-12-291-1/+1
* | | Ensure `first!` and friends work on loaded associationsSean Griffin2014-12-293-0/+12
* | | Require Arel 7.0.0.alphaSean Griffin2014-12-291-1/+1
* | | Remove all cases of manuallly wrapping `Arel::Nodes::Quoted`Sean Griffin2014-12-297-34/+15