aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | rm useless methodAaron Patterson2015-08-241-4/+0
|/ / / / / / / /
* | | | | | | | remove dead code :bomb:Aaron Patterson2015-08-241-2/+0
* | | | | | | | pull up dispatcher allocationAaron Patterson2015-08-242-5/+1
* | | | | | | | directly ask the request for the controller classAaron Patterson2015-08-241-6/+1
* | | | | | | | use `make_set` helper method to generate route setsAaron Patterson2015-08-241-31/+1
* | | | | | | | remove useless ivarAaron Patterson2015-08-241-2/+1
* | | | | | | | remove setter for the dispatcher classAaron Patterson2015-08-241-2/+2
* | | | | | | | subclass and delegate rather than mutating existing objectsAaron Patterson2015-08-241-12/+29
* | | | | | | | Merge pull request #21359 from Gaurav2728/gaurav-remove_unused_require_fileRafael Mendonça França2015-08-242-3/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | temp files are no more requireGaurav Sharma2015-08-252-3/+0
|/ / / / / / / /
* | | | | | | | use a custom request class to determine the controller classAaron Patterson2015-08-242-25/+28
* | | | | | | | Pass the correct formatsRafael Mendonça França2015-08-241-2/+2
* | | | | | | | Pass formats to lookup_contextRafael Mendonça França2015-08-242-8/+9
* | | | | | | | Allow release when CHANGELOG is changedRafael Mendonça França2015-08-241-1/+1
* | | | | | | | remove useless case in #resolve_layout.Nick Sutterer2015-08-241-2/+0
* | | | | | | | remove LookupContext#with_layout_format by passing formats for layouts explic...Nick Sutterer2015-08-243-24/+11
* | | | | | | | Merge pull request #21354 from yui-knk/fix/migration_file_timestampRobin Dupret2015-08-242-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | [ci skip] Fix migration file's timestampyui-knk2015-08-242-2/+2
* | | | | | | | | Merge pull request #21339 from deepj/unused-block-argumentsCarlos Antonio da Silva2015-08-242-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove unused block argumentsdeepj2015-08-232-3/+3
* | | | | | | | | | Merge pull request #21355 from akihiro17/remove-variablesRafael Mendonça França2015-08-241-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove unused variablesakihiro172015-08-241-2/+2
* | | | | | | | | | | Merge pull request #21342 from yui-knk/test/add_assert_methodRafael Mendonça França2015-08-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Add `assert_nothing_raised` to make clear test case perposeyui-knk2015-08-231-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #21267 from davidcornu/rails-server-port-env-varRafael Mendonça França2015-08-243-1/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use the PORT environment variable for rails serverDavid Cornu2015-08-183-1/+12
* | | | | | | | | | | Further fix failing tests caused by #21350Sean Griffin2015-08-241-0/+1
* | | | | | | | | | | Fix failing tests caused by #21350Sean Griffin2015-08-241-0/+1
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | 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