aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | Merge pull request #23850 from prathamesh-sonpatki/changelog-for-23734Rafael França2016-02-241-0/+5
| |\ \
| | * | Add CHANGELOG for https://github.com/rails/rails/pull/23734 [ci skip]Prathamesh Sonpatki2016-02-241-0/+5
| |/ /
| * | No need CHANGELOG entry for #23849.Rafael Mendonça França2016-02-241-16/+0
| * | Make internal class as nodocRafael Mendonça França2016-02-241-2/+2
| * | Merge pull request #23616 from piotrj/issue_23609_logger_broadcast_silencingRafael Mendonça França2016-02-244-21/+86
| |\ \
| | * | Fix logger silencing for broadcasted loggersPiotr Jakubowski2016-02-114-21/+86
| * | | Always use the released coffee-rails in new applicationsRafael Mendonça França2016-02-241-6/+1
| * | | Merge pull request #23849 from prathamesh-sonpatki/fix-23822Rafael França2016-02-244-9/+35
| |\ \ \
| | * | | Show permitted flag in the output of AC::Parameters#inspectPrathamesh Sonpatki2016-02-244-9/+35
| * | | | Ignore callstacks from Ruby stdlib in deprecationRafael Mendonça França2016-02-241-4/+12
| * | | | Merge pull request #23795 from claudiob/replace-rack-with-rails-commandDavid Heinemeier Hansson2016-02-244-14/+64
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Invoke 'rails' instead of 'rake' in AppGeneratorclaudiob2016-02-202-11/+11
| | * | | AppGenerator: Replace 'rake' with 'rails_command'claudiob2016-02-204-8/+58
| * | | | Merge pull request #20851 from tomprats/indifferent-sessionsRafael Mendonça França2016-02-249-17/+147
| |\ \ \ \
| | * | | | Update Session to utilize indiffernt accessTom Prats2016-01-308-16/+127