aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Removed mocha from Active Record Part 1Ronak Jangir2015-08-2512-119/+153
* Merge pull request #21350 from agis-/issue-21223Sean Griffin2015-08-246-1/+18
|\
| * Only nullify persisted has_one target associationsAgis-2015-08-246-1/+18
* | Merge pull request #21091 from y-yagi/add_activejob_section_to_instrumentatio...Yves Senn2015-08-241-0/+32
|\ \
| * | add Active Job section to instrumentation guide [ci skip]yuuji.yaginuma2015-08-021-0/+32
* | | Merge pull request #21321 from rodzyn/removing_mochaKasper Timm Hansen2015-08-2410-78/+103
|\ \ \
| * | | Get rid of mocha tests - part 1Marcin Olichwirowicz2015-08-2410-78/+103
* | | | Merge pull request #21320 from piton4eg/patch-8Yves Senn2015-08-241-7/+8
|\ \ \ \
| * | | | Fix docs for debugging [ci skip]:Alexey Markov2015-08-241-7/+8
* | | | | guides, move incomplete example to corresponding option. #21349Yves Senn2015-08-241-2/+4
| |_|_|/ |/| | |
* | | | Merge pull request #21347 from ronakjangir47/remove_mocha_actionviewKasper Timm Hansen2015-08-248-81/+105
|\ \ \ \
| * | | | Removed Mocha from ActionView part 1Ronak Jangir2015-08-248-81/+105
* | | | | Merge branch 'master' of github.com:rails/railsVijay Dev2015-08-24456-4925/+7457
|\ \ \ \ \
| * \ \ \ \ Merge pull request #21348 from yui-knk/fix/about_comma_style_2Vijay Dev2015-08-241-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | [ci skip] Fix the grammaryui-knk2015-08-241-1/+1
| |/ / / /
| * | | | use methods on the request object instead of accessing envAaron Patterson2015-08-231-7/+7
| * | | | use `Request#path_info` instead of direct ENV accessAaron Patterson2015-08-231-1/+1
| * | | | remove env access from debug_exceptionsAaron Patterson2015-08-231-10/+9
| * | | | remove more `env` accessAaron Patterson2015-08-231-11/+19
| * | | | remove more env accessAaron Patterson2015-08-231-3/+3
| * | | | remove more env accessAaron Patterson2015-08-231-4/+6
| * | | | convert more `@env` access to get / set headerAaron Patterson2015-08-232-12/+14
| * | | | remove usage of `@env`Aaron Patterson2015-08-231-3/+5
| * | | | Merge pull request #21341 from yui-knk/fix/ar_test_remove_innermethodYves Senn2015-08-231-5/+1
| |\ \ \ \
| | * | | | Remove test helper method to inside test methodyui-knk2015-08-231-5/+1
| * | | | | Merge pull request #21340 from ronakjangir47/request_objectYves Senn2015-08-231-3/+3
| |\ \ \ \ \
| | * | | | | Another place to use a request object in NullSessionHash Ronak Jangir2015-08-231-3/+3
| | |/ / / /
| * | | | | Merge pull request #21343 from shunsukeaida/remove_broken_linkArun Agrawal2015-08-231-1/+1
| |\ \ \ \ \
| | * | | | | Remove a link to the site that seems to be gone. [ci skip]shunsukeaida2015-08-231-1/+1
| | |/ / / /
| * | | | | Merge pull request #21332 from ronakjangir47/take_docsEileen M. Uchitelle2015-08-231-0/+25
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Added docs for CollectionProxy#take [ci skip]Ronak Jangir2015-08-231-0/+25
| * | | | | Merge pull request #21338 from y-yagi/fix_strip_links_exampleAbdelkader Boudih2015-08-231-2/+2
| |\ \ \ \ \
| | * | | | | fix syntax error in strip_links example [ci skip]yuuji.yaginuma2015-08-231-2/+2
| * | | | | | Merge pull request #21335 from yui-knk/refactor/remove_not_used_block_argYves Senn2015-08-231-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Remove not used a block argument (`&block`)yui-knk2015-08-231-1/+1
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #21334 from yui-knk/doc/about_comma_styleRichard Schneeman2015-08-221-0/+5
| |\ \ \ \ \
| | * | | | | [ci skip] Add style guide about commayui-knk2015-08-231-0/+5
| | |/ / / /
| * | | | | use a request object in the session middlewareAaron Patterson2015-08-228-71/+77
| * | | | | move more `@env` access to method callsAaron Patterson2015-08-221-16/+16
| * | | | | move ORIGINAL_SCRIPT_NAME to the metaprogrammed methodsAaron Patterson2015-08-221-4/+1
| * | | | | metaprogram the HTTP_X_REQUEST_ID methodAaron Patterson2015-08-221-6/+1
| * | | | | use `body_stream` instead of getting the env value ourselvesAaron Patterson2015-08-221-1/+1
| * | | | | convert `@env` use to get / set headerAaron Patterson2015-08-221-16/+16
| * | | | | use get / set header to avoid depending on the `env` ivarAaron Patterson2015-08-221-11/+14
| * | | | | Merge pull request #20757 from bquorning/http-status-codes-changed-in-rackSantiago Pastorino2015-08-222-4/+14
| |\ \ \ \ \
| | * | | | | 4.2 release notes about `render` status optionsBenjamin Quorning2015-08-211-0/+11
| | * | | | | Rack changed their status codes to IETF RFC 7231Benjamin Quorning2015-08-211-4/+3
| * | | | | | Fix Railties test failure for asset routeseileencodes2015-08-221-1/+5
| * | | | | | Refactor to remove controller class from route to requesteileencodes2015-08-223-41/+21
| * | | | | | Merge pull request #21328 from jonatack/fix-debugging-rails-guideKasper Timm Hansen2015-08-221-7/+9
| |\ \ \ \ \ \