aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add ApplicationController.renderer initializer [ci skip]brainopia2015-01-221-0/+6
* Add ActionController::Base.renderbrainopia2015-01-223-0/+10
* Add ActionController::Rendererbrainopia2015-01-225-0/+216
* Add ActionController#build_with_envbrainopia2015-01-221-0/+6
* Support `:assigns` option when rendering with controllers/mailers.brainopia2015-01-223-2/+18
* Add `ActionController::Metal#set_request!`brainopia2015-01-213-4/+17
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-01-156-99/+138
|\
| * Fixed spacing issues on code comments in ActiveJob Basics guide.Vipul A M2015-01-141-7/+9
| * GlobalID::Identification has been mixed into AR not AMCristian Bica2015-01-081-1/+1
| * Fix typo "you can be disable"claudiob2015-01-061-1/+1
| * Better examples for fresh_when and stale?claudiob2015-01-061-2/+2
| * Fix docs for ActiveSupport::Inflector methodsclaudiob2015-01-032-81/+71
| * Better example of `teardown` method in test guideKir Shatrov2015-01-031-4/+2
| * Demonstrate example of `assert_emails` in testing guideKir Shatrov2015-01-031-3/+4
| * Docs for controller test helpersKir Shatrov2015-01-031-0/+35
| * Avoid double negation in test guideKir Shatrov2015-01-031-1/+1
| * Section about testing xhr requestsKir Shatrov2015-01-031-0/+13
* | Only use the `_before_type_cast` in the form when from user inputSean Griffin2015-01-145-2/+47
* | Add tests with an explanation of why we're using `_before_type_cast`Sean Griffin2015-01-141-3/+4
* | Revert "Don't use the `_before_type_cast` version of attributes in the form"Sean Griffin2015-01-144-3/+13
* | Don't use the `_before_type_cast` version of attributes in the formSean Griffin2015-01-144-13/+3
* | Go through normal where logic in destroy with lockingSean Griffin2015-01-141-6/+2
* | Go through normal where logic in destroySean Griffin2015-01-141-9/+1
* | Don't default to YAML dumping when quoting valuesSean Griffin2015-01-143-11/+13
* | Merge pull request #18521 from andrewvida/masterRafael Mendonça França2015-01-141-1/+1
|\ \
| * | Correct views mail method sends in API docsAndrew Vida2015-01-141-1/+1
* | | Merge pull request #18510 from prathamesh-sonpatki/some-more-in-on-githubXavier Noria2015-01-142-2/+2
|\ \ \
| * | | Changed "in GitHub" to "on GitHub" [ci skip]Prathamesh Sonpatki2015-01-142-2/+2
* | | | Merge pull request #18509 from prathamesh-sonpatki/cg-typoRobin Dupret2015-01-141-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix typo in ActionView CHANGELOG [ci skip]Prathamesh Sonpatki2015-01-141-1/+1
|/ / /
* | | Merge pull request #18503 from vipulnsward/guides-in-onXavier Noria2015-01-1451-51/+51
|\ \ \
| * | | - Changed `IN` to `ON` in markdown renderer conditionVipul A M2015-01-1451-51/+51
* | | | require 'rails' if not include_all_railties, just as 'rails/all' doesAkira Matsuda2015-01-141-0/+1
* | | | Merge pull request #18500 from nippysaurus/typo_fixYves Senn2015-01-141-1/+1
|\ \ \ \
| * | | | improve grammarMichael Dawson2015-01-141-1/+1
* | | | | Merge pull request #18504 from vipulnsward/extract-dateYves Senn2015-01-141-3/+4
|\ \ \ \ \
| * | | | | Extract `Date` header to string constant in Http Response, similar to other h...Vipul A M2015-01-141-3/+4
| |/ / / /
* | | | | Merge pull request #18502 from y-yagi/fix_autoloading_guideYves Senn2015-01-141-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix link in autoloading guide [ci skip]yuuji.yaginuma2015-01-141-1/+1
|/ / / /
* | | | Merge pull request #18478 from yoshiokatsuneo/active_record_connection_pool_e...Sean Griffin2015-01-131-1/+2
|\ \ \ \
| * | | | ActiveRecord: On reconnection failure, release only failed connetion.Yoshioka Tsuneo2015-01-131-1/+2
* | | | | Merge pull request #18491 from dreeve/form-for-guide-fix-generated-actionAbdelkader Boudih2015-01-131-2/+2
|\ \ \ \ \
| * | | | | Fix form_for guide binding a form to an object.Derek Reeve2015-01-131-2/+2
* | | | | | Merge pull request #18489 from Envek/ru_timezonesAndrew White2015-01-132-1/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add missing time zone definitions for Russian FederationAndrey Novikov2015-01-132-1/+9
* | | | | | Merge pull request #18490 from andreynering/security-guides-remove-resourceAbdelkader Boudih2015-01-131-1/+0
|\ \ \ \ \ \
| * | | | | | Guides: Removing reference to blog that is not updated anymore [ci skip]Andrey Nering2015-01-131-1/+0
* | | | | | | Merge pull request #18476 from Alamoz/scaffold_index_view_grammarDavid Heinemeier Hansson2015-01-131-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Clean up grammar in scaffold index view, by removing the word 'Listing' from ...Adrien Lamothe2015-01-121-1/+1
* | | | | | | | Add the `method_source` gem to the default GemfileSean Griffin2015-01-133-0/+15