aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* rails -> Rails [ci skip]Santosh Wadghule2016-07-128-10/+10
* Merge pull request #25757 from monkey-mas/add-tests-for-response_testGuillermo Iguaran2016-07-101-0/+20
|\
| * Add tests for 1xx, 204 and 304 responses to response_test.rbMasaru Nomura2016-07-091-0/+20
* | Merge pull request #25769 from y-yagi/remove_unnecessary_sendGuillermo Iguaran2016-07-101-5/+5
|\ \
| * | remove unnecessary sendyuuji.yaginuma2016-07-101-5/+5
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-07-103-3/+18
|\ \ \ | |/ / |/| |
| * | Fix documentation for number_with_precision helper in AV guide [ci skip]Prathamesh Sonpatki2016-07-061-1/+1
| * | Expand on Instance variables section with an example and specify when the ins...Vipul A M2016-07-021-1/+14
| * | Fix number_with_precision documentation for precision [ci skip]Vipul A M2016-07-021-1/+1
| * | Expand on #24071 for specifying custom locale fallbacks. [ci skip]Vipul A M2016-06-291-1/+3
* | | Merge pull request #25759 from prathamesh-sonpatki/changelog-cleanupsRafael França2016-07-092-8/+12
|\ \ \
| * | | Cleanup CHANGELOGs [ci skip]Prathamesh Sonpatki2016-07-092-8/+12
| | |/ | |/|
* | | Merge pull request #25766 from vipulnsward/fix-ac-tests-2-4Rafael França2016-07-091-1/+1
|\ \ \ | |/ / |/| |
| * | Fix AJ tests on ruby 2.4 being causes since classes are unified for Integer, ...Vipul A M2016-07-091-1/+1
* | | Merge pull request #23636 from rab/fix-to_param-truncationMatthew Draper2016-07-093-4/+41
|\ \ \
| * | | fix to_param to maximize contentRob Biedenharn2016-07-083-4/+41
|/ / /
* | | Merge pull request #25652 from prathamesh-sonpatki/rm-boot-railsGuillermo Iguaran2016-07-0838-46/+3
|\ \ \
| * | | Remove unused boot_rails method and it's usagePrathamesh Sonpatki2016-07-0438-46/+3
* | | | Merge pull request #25688 from mahnunchik/host-env-varGuillermo Iguaran2016-07-082-0/+8
|\ \ \ \
| * | | | Use the HOST environment variable for rails server #25677Evgeny Vlasenko2016-07-052-0/+8
* | | | | Correct changelog layoutMatthew Draper2016-07-091-8/+8
* | | | | Insert changelog entry for #25615Matthew Draper2016-07-091-0/+7
* | | | | Merge pull request #25624 from tinco/actioncable_write_raceMatthew Draper2016-07-092-2/+12
|\ \ \ \ \
| * | | | | fix race condition in websocket stream writeTinco Andringa2016-07-011-0/+4
* | | | | | Merge pull request #25714 from robin850/changelog-25692Rafael Mendonça França2016-07-071-0/+6
|\ \ \ \ \ \
| * | | | | | Add a changelog entry for #25692 [ci skip]Robin Dupret2016-07-061-0/+6
* | | | | | | Merge pull request #25745 from alexcameron89/schema_statementsVipul A M2016-07-071-12/+12
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | [ci skip] Update documentation in AR SchemaStatementsAlex Kitchens2016-07-071-12/+12
|/ / / / / /
* | | | | | Merge pull request #25730 from prathamesh-sonpatki/rm-cookie-onlyRafael França2016-07-072-1/+7
|\ \ \ \ \ \
| * | | | | | Add a test case for verifying `cookie_only` is set even if user tries to set ...Prathamesh Sonpatki2016-07-072-1/+7
* | | | | | | Merge pull request #25743 from abhishekjain16/small_fixRafael França2016-07-071-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix typo in test caseAbhishek Jain2016-07-081-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #25736 from voxik/file-store-test-require-pathnameRafael França2016-07-071-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Pathname might not be always initialized.Vít Ondruch2016-07-071-0/+2
* | | | | | | | Merge pull request #25731 from chen7897499/fix_typoYves Senn2016-07-071-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix typo: caches_pages to caches_page.chen78974992016-07-071-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #25691 from y-yagi/test_with_latest_rescueRafael França2016-07-072-8/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | test with latest resqueyuuji.yaginuma2016-07-052-8/+13
* | | | | | | | | Merge pull request #25707 from matthewd/double-reapMatthew Draper2016-07-074-11/+50
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make connection stealing more explicitMatthew Draper2016-07-063-6/+27
| * | | | | | | | | Reduce locking by taking ownership of stale connectionsMatthew Draper2016-07-061-9/+8
| * | | | | | | | | Re-check that the connection is still stale before we reap itMatthew Draper2016-07-062-0/+9
| * | | | | | | | | Check connection ownership before allowing a thread to release itMatthew Draper2016-07-061-1/+11
* | | | | | | | | | Merge pull request #25726 from Gaurav2728/update_doc_for_require_relativeMatthew Draper2016-07-072-5/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | update doc for prefer require_relative over require + File.expand_path [ci skip]Gaurav Sharma2016-07-072-5/+5
|/ / / / / / / / /
* | | | | | | | | Merge pull request #25720 from timrogers/actiondispatch-ssl-defaults-docsप्रथमेश Sonpatki2016-07-061-4/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ci skip] Correct defaults in documentation for ActionDispatch::SSLTim Rogers2016-07-061-4/+5
|/ / / / / / / / /
* | | | | | | | | Merge pull request #25717 from alexcameron89/connection_pool_docप्रथमेश Sonpatki2016-07-061-21/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ci skip] Update ConnectionPool documentation for readabilityAlex Kitchens2016-07-061-21/+21
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #25716 from willnet/remove-rails-4प्रथमेश Sonpatki2016-07-061-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |