aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge pull request #20851 from tomprats/indifferent-sessions"Matthew Draper2016-02-263-21/+2
* Revert "Update Session to utilize indiffernt access"Matthew Draper2016-02-268-127/+16
* Merge pull request #23889 from claudiob/fix-getting-startedClaudio B2016-02-251-16/+20
|\
| * Doc: update AC::Parameters guides for Rails 5claudiob2016-02-251-2/+2
| * Doc: update routes guides for Rails 5claudiob2016-02-251-14/+18
|/
* Merge pull request #23874 from st0012/update-documentsAndrew White2016-02-251-1/+3
|\
| * Add config.debug_exception_response_format into configuration guideStan Lo2016-02-251-0/+2
| * Update config.force_ssl's documentationStan Lo2016-02-251-1/+1
* | Additional review of 6b31761.Kasper Timm Hansen2016-02-253-3/+2
* | Merge pull request #23827 from rails/new_implicit_renderGodfrey Chan2016-02-2514-57/+235
|\ \ | |/ |/|
| * Lock down new `ImplicitRender` behavior for 5.0 RCGodfrey Chan2016-02-2514-57/+235
|/
* Merge pull request #23843 from maclover7/fix-23471Matthew Draper2016-02-253-10/+29
|\
| * Only hijack Rack socket when first neededJon Moss2016-02-243-10/+29
* | Merge pull request #23863 from delftswa2016/fix-readme-headingJon Moss2016-02-243-4/+4
|\ \
| * | Fix title of README according to Markdown conventionsAaron Ang2016-02-253-4/+4
* | | Merge pull request #23488 from maclover7/actioncable-defaultsMatthew Draper2016-02-2512-21/+49
|\ \ \ | |_|/ |/| |
| * | Only open Action Cable connection if data is being sentJon Moss2016-02-242-6/+6
| * | Enable Action Cable routes by defaultJon Moss2016-02-2410-15/+43
* | | Merge pull request #23862 from prathamesh-sonpatki/test-for-strong-etagRafael França2016-02-241-0/+8
|\ \ \ | |/ / |/| |
| * | Added a test for generating Strong ETagPrathamesh Sonpatki2016-02-241-0/+8
* | | Merge pull request #23870 from akshaymohite/api-app-debug-exception-response-...Jon Moss2016-02-241-0/+17
|\ \ \
| * | | [ci skip] Need to mention debug_exception_response_format in the api_app docu...Akshay2016-02-251-0/+17
|/ / /
* | | Merge pull request #23866 from abhishekjain16/documentJon Moss2016-02-242-2/+2
|\ \ \
| * | | [ci skip] Replace usage of rake routes with rails routesAbhishek Jain2016-02-252-2/+2
* | | | Ensure suppressor runs before validationseileencodes2016-02-244-2/+25
* | | | Merge branch 'master' into treewipAaron Patterson2016-02-24198-1246/+2139
|\| | |
| * | | remove useless methodAaron Patterson2016-02-241-2/+0
| * | | Merge pull request #23861 from chashmeetsingh/patch-1प्रथमेश Sonpatki2016-02-241-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Updated file documentation [ci skip]Chashmeet Singh2016-02-241-1/+1
| |/ /
| * | Merge pull request #23860 from zerothabhishek/weak-etag-guideRafael França2016-02-241-0/+8
| |\ \
| | * | changes caching guide to add note on weak etagsAbhishek Yadav2016-02-241-0/+8
| * | | Merge pull request #23859 from prathamesh-sonpatki/dont-put-perform-caching-c...Rafael França2016-02-241-8/+2
| |\ \ \
| | * | | Don't put config.action_mailer.perform_caching entry twice in development.rbPrathamesh Sonpatki2016-02-241-8/+2
| * | | | Merge pull request #23857 from st0012/update-documentsRafael França2016-02-244-1/+26
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix wording and wrong referenceStan Lo2016-02-252-2/+2
| | * | | Fix ActionView's cache section referenceStan Lo2016-02-251-1/+1
| | * | | Add caching guide in ActionMailer basicsStan Lo2016-02-251-0/+16
| | * | | Add ActionMailer configuration optionsStan Lo2016-02-251-0/+3
| | * | | Update 5.0 release notesStan Lo2016-02-251-0/+6
| * | | | Merge pull request #23858 from claudiob/fix-aca-readmeClaudio B2016-02-241-4/+5
| |\ \ \ \
| | * | | | Add Ruby formatting to CHANGELOG entryclaudiob2016-02-241-4/+5
| |/ / / /
| * | | | Do not define methods in the included blockRafael Mendonça França2016-02-241-293/+289
| * | | | Preparing for 5.0.0.beta3 releaseeileencodes2016-02-2410-0/+26
| * | | | Enable tmp_restart plugin for pumaRafael Mendonça França2016-02-241-0/+3
| * | | | Prep release for Rails 5 beta3eileencodes2016-02-2412-45/+45
| |/ / /
| * | | [ci skip] Move collection caching changelog entry.Kasper Timm Hansen2016-02-241-25/+25
| * | | Merge pull request #23853 from kamipo/ensure_drop_tableRafael França2016-02-241-7/+5
| |\ \ \
| | * | | Ensure `drop_table` even if tests failure or interruptedRyuta Kamizono2016-02-241-7/+5
| * | | | :bomb: run the test @rafaelfranca :angry:Rafael Mendonça França2016-02-241-1/+1
| |/ / /
| * | | Remove changelog entry for reverted commiteileencodes2016-02-241-12/+0