aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* lookup subdomain from the options hash once, defaulting to trueAaron Patterson2014-06-121-2/+2
* only extract domain from the options hash onceAaron Patterson2014-06-121-3/+4
* reduce calls to `named_host?`Aaron Patterson2014-06-121-2/+6
* use Ruby for mockingAaron Patterson2014-06-121-1/+1
* Merge pull request #15394 from morgoth/fix-automatic-maintaining-test-schema-...Yves Senn2014-06-124-2/+104
|\
| * Fixed automatic maintaining test schema to properly handle sql structure sche...Wojciech Wnętrzak2014-06-124-3/+64
| * Added missing test case for migrations when using sql structureWojciech Wnętrzak2014-06-011-1/+40
* | Merge pull request #15590 from zuhao/refactor_actionview_register_template_ha...Yves Senn2014-06-126-18/+62
|\ \
| * | Add unregister_template_handler to prevent leaks.Zuhao Wan2014-06-127-18/+62
* | | Merge pull request #15662 from JuanitoFatas/patch/remove-warningYves Senn2014-06-121-2/+2
|\ \ \
| * | | Removed warning actionpack url.rbJuanito Fatas2014-06-121-2/+2
|/ / /
* | | Merge pull request #15647 from sgrif/sg-unused-requireYves Senn2014-06-121-2/+0
|\ \ \
| * | | Remove unused requireSean Griffin2014-06-111-2/+0
* | | | Merge pull request #15655 from fabianrbz/remove-unused-method-in-testYves Senn2014-06-121-10/+0
|\ \ \ \
| * | | | remove unnused method from testFabian Rodriguez2014-06-111-10/+0
* | | | | Merge pull request #15657 from JohnRiv/guides_asset_pipeline_localZachary Scott2014-06-111-5/+4
|\ \ \ \ \
| * | | | | There are 3 caveats to Local Precompilation including 1 config changeJohn Riviello2014-06-111-5/+4
* | | | | | Merge pull request #15656 from JohnRiv/guides_asset_pipeline_precompilingZachary Scott2014-06-111-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Updating argument names in default matcher for compiling filesJohn Riviello2014-06-111-1/+1
| |/ / / /
* | | | | remove useless to_param callAaron Patterson2014-06-111-1/+1
* | | | | only look up the subdomain onceAaron Patterson2014-06-111-3/+4
* | | | | scheme should contain one or more charactersAaron Patterson2014-06-111-1/+1
* | | | | pull the port out of the options hash onceAaron Patterson2014-06-111-2/+3
* | | | | remove useless nil checkAaron Patterson2014-06-111-2/+2
* | | | | these methods are always called with a tld_parameterAaron Patterson2014-06-111-3/+3
|/ / / /
* | | | Merge pull request #15652 from sgrif/pluck-multiple-named-columnsRafael Mendonça França2014-06-113-3/+15
|\ \ \ \
| * | | | Pluck should work with columns of the same name from different tablesSean Griffin2014-06-113-3/+15
|/ / / /
* | | | rm `same_host?`. The same conditional is two lines down.Aaron Patterson2014-06-111-5/+3
* | | | Revert "rm `same_host?`. The same conditional is two lines down."Aaron Patterson2014-06-111-5/+8
* | | | rm `same_host?`. The same conditional is two lines down.Aaron Patterson2014-06-111-8/+5
* | | | Revert "remove unnecssary require of `to_param`, as `to_query` is already req...Rafael Mendonça França2014-06-114-0/+4
* | | | Merge pull request #15650 from kuldeepaggarwal/remove-unecessary-requireRafael Mendonça França2014-06-113-3/+0
|\ \ \ \
| * | | | remove unnecssary require of `to_param`, as `to_query` is already require `to...Kuldeep Aggarwal2014-06-123-3/+0
* | | | | Merge pull request #15648 from kuldeepaggarwal/fix-warningsRafael Mendonça França2014-06-112-3/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | remove warningsKuldeep Aggarwal2014-06-122-3/+0
* | | | | cache host on the stack so we only look it up onceAaron Patterson2014-06-111-8/+9
* | | | | only pull :protocol from the options hash onceAaron Patterson2014-06-111-2/+3
* | | | | cache protocol on the stack to reduce options hash lookupsAaron Patterson2014-06-111-7/+7
* | | | | eliminate nil checks in normalize_portAaron Patterson2014-06-111-7/+7
* | | | | reduce hash lookups and disconnect normalize_port from the options hashAaron Patterson2014-06-111-9/+9
| |/ / / |/| | |
* | | | Merge pull request #15646 from aditya-kapoor/correct-conversion-docsZachary Scott2014-06-111-5/+12
|\ \ \ \ | |/ / / |/| | |
| * | | [ci skip] correct docs for conversionAditya Kapoor2014-06-111-5/+12
* | | | Merge pull request #15644 from akshay-vishnoi/activesupportRafael Mendonça França2014-06-111-1/+0
|\ \ \ \ | |/ / / |/| | |
| * | | No need to require to_param, it is already required in to_query.rbAkshay Vishnoi2014-06-111-1/+0
* | | | Merge pull request #15643 from aditya-kapoor/add-testRafael Mendonça França2014-06-111-0/+4
|\ \ \ \
| * | | | [ci skip] add tests for ActionModel::ConversionAditya Kapoor2014-06-111-0/+4
|/ / / /
* | | | Merge pull request #15642 from akshay-vishnoi/activesupportRafael Mendonça França2014-06-111-0/+0
|\| | |
| * | | Move test for blank.rb under objectAkshay Vishnoi2014-06-111-0/+0
|/ / /
* | | Merge pull request #15582 from sgrif/sg-timestampsRafael Mendonça França2014-06-111-3/+5
|\ \ \
| * | | Refactor determination of max updated timestampSean Griffin2014-06-091-3/+5