aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | [ci skip] Remove reference to Rails 4 in the initialization guide.willnet2016-07-061-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #25708 from maclover7/jm-master-bugreportsSantiago Pastorino2016-07-063-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bump version for master bug report templatesJon Moss2016-07-053-3/+3
* | | | | | | | | | Merge pull request #25710 from y-yagi/follow_up_to_24436प्रथमेश Sonpatki2016-07-064-5/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | remove `-t` option from default sendmail arguments [ci skip]yuuji.yaginuma2016-07-064-5/+5
|/ / / / / / / / /
* | | | | | | | | Merge pull request #24890 from vipulnsward/travel-to-raiseKasper Timm Hansen2016-07-054-14/+116
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | `travel/travel_to` travel time helpers, now raise on nested calls,Vipul A M2016-07-024-14/+116
* | | | | | | | | | Merge pull request #25704 from fledman/add_respond_to_missing_to_rails_applic...Rafael França2016-07-052-0/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | implement respond_to_missing? to match method_missingDavid Feldman2016-07-052-0/+11
* | | | | | | | | | | Merge pull request #25668 from kamipo/use_squish_rather_than_strip_heredocRafael França2016-07-052-4/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use `squish` rather than `strip_heredoc`Ryuta Kamizono2016-07-042-4/+4
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #25692 from johnmeehan/allow-registering-directory-for-rak...Rafael França2016-07-052-0/+18
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix test to try `spec/` directory as opposed to `app/spec` which I hadJohn Meehan2016-07-051-2/+2
| * | | | | | | | | | removed extra blank lineJohn Meehan2016-07-051-1/+0
| * | | | | | | | | | Allow rake notes to work with other directories.John Meehan2016-07-052-0/+19
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge pull request #25693 from volmer/masterRafael França2016-07-052-0/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Deprecate usage of nil as route pathVolmer2016-07-052-0/+13
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #25257 from ta1kt0me/inspect_initializersRichard Schneeman2016-07-053-1/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Initializer provides its context class nameta1kt0me2016-06-123-3/+10
| * | | | | | | | | | Delegate public method for raitile nameta1kt0me2016-06-112-1/+3
| * | | | | | | | | | Display railtie class name in `rails initializers`ta1kt0me2016-06-021-1/+1