aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* A few documentation tweaks [ci skip]Robin Dupret2015-06-071-2/+2
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-06-051-1/+1
|\
| * [ci skip] Upcase `is`yui-knk2015-05-251-1/+1
* | pass check_ip and proxies to GetIp constructorAaron Patterson2015-06-031-4/+4
* | Merge pull request #20383 from jonatack/fix-configurable-static-index-filenameSantiago Pastorino2015-06-021-3/+3
|\ \
| * | Fix regression in #20017: wrong number of arguments errorJon Atack2015-05-301-3/+3
* | | Merge pull request #20410 from schneems/schneems/boo-global-varsRafael Mendonça França2015-06-011-1/+1
|\ \ \
| * | | Use block variable instead of globalschneems2015-06-011-1/+1
* | | | Merge pull request #19094 from phoet/have_bearer_be_valid_as_wellRafael Mendonça França2015-06-013-2/+19
|\ \ \ \
| * | | | add changelog entryphoet2015-06-011-0/+10
| * | | | allow `Bearer` as well as `Token`phoet2015-06-012-1/+8
| * | | | actually test what the name saysphoet2015-06-011-1/+1
* | | | | Merge pull request #20138 from tgxworld/deprecated_assert_templateRafael Mendonça França2015-06-0117-685/+114
|\ \ \ \ \
| * | | | | Remove `assigns` and `assert_template`.Guo Xiang Tan2015-05-3017-685/+114
| | |/ / / | |/| | |
* | | | | Merge pull request #20284 from kaspth/fix-caching-testRafael Mendonça França2015-06-013-3/+9
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Replace expectation with state check.Kasper Timm Hansen2015-05-303-3/+9
* | | | | Use `any?` rather than `present?` to check argseileencodes2015-05-312-2/+2
| |_|/ / |/| | |
* | | | match method doc fix [ci skip]Mehmet Emin İNAÇ2015-05-301-3/+6
* | | | [ci skip] match without via is now deprecatedYoong Kang Lim2015-05-301-1/+1
| |/ / |/| |
* | | Merge pull request #20358 from tgxworld/remove_codeSantiago Pastorino2015-05-291-2/+0
|\ \ \
| * | | Remove unused code.Guo Xiang Tan2015-05-291-2/+0
* | | | Fix warning about ambiguous first argumentArun Agrawal2015-05-291-1/+1
|/ / /
* | | Merge pull request #20341 from vngrs/remove_already_defined_methods_in_rack_r...Rafael Mendonça França2015-05-281-36/+0
|\ \ \
| * | | Remove already defined methods in super class of ActionDispatch::Request classMehmet Emin İNAÇ2015-05-281-36/+0
* | | | Merge pull request #20017 from eliotsykes/configurable-static-index-filenameRafael Mendonça França2015-05-287-4/+31
|\ \ \ \
| * | | | config.static_index configures directory index "index.html" filenameEliot Sykes2015-05-287-4/+31
| |/ / /
* | | | Merge pull request #20331 from arunagw/arunagw-remove-unused-package-tasksRafael Mendonça França2015-05-281-7/+0
|\ \ \ \
| * | | | Remove unused package tasksArun Agrawal2015-05-281-7/+0
| |/ / /
* / / / Deprecate `:nothing` option for render methodMehmet Emin İNAÇ2015-05-2810-13/+28
|/ / /
* | | Merge pull request #20329 from EduardoBautista/json-api-supportRafael Mendonça França2015-05-271-1/+1
|\ \ \
| * | | Add application/vnd.api+json alias to the JSON MIME Type.Eduardo Bautista2015-05-271-1/+1
* | | | Merge pull request #19808 from byroot/action-parameterRafael Mendonça França2015-05-272-15/+32
|\ \ \ \
| * | | | Allow to parameters named `action` or `controller` from AC::TestCase helpersJean Boussier2015-04-182-15/+32
* | | | | Merge pull request #20316 from vngrs/add_assertion_for_get_method_into_reques...Rafael Mendonça França2015-05-271-0/+1
|\ \ \ \ \
| * | | | | Add assertion for get? method into test casesMehmet Emin İNAÇ2015-05-271-0/+1
* | | | | | Documentation for ActionDispatch::Request form_data? method [ci skip]Mehmet Emin İNAÇ2015-05-271-0/+2
|/ / / / /
* | | | | Merge pull request #20262 from arunagw/aa-remove-broken-unused-release-taskYves Senn2015-05-271-7/+0
|\ \ \ \ \
| * | | | | Remove broken and unused release taskArun Agrawal2015-05-221-7/+0
* | | | | | Add missing nodocs and docs for ActionDispatch::Request [ci skip]Mehmet Emin İNAÇ2015-05-261-3/+5
* | | | | | Use memoization while accessing request headers for minimizing memory usageMehmet Emin İNAÇ2015-05-251-1/+1
| |_|/ / / |/| | | |
* | | | | remove useless ivarAaron Patterson2015-05-231-1/+0
* | | | | add a branch to eliminate multiple nil checksAaron Patterson2015-05-231-3/+5
* | | | | move request id manipulation to the request objectAaron Patterson2015-05-222-7/+18
* | | | | Spelling/typo/grammatical fixes [ci skip]karanarora2015-05-236-7/+7
|/ / / /
* | | | Merge pull request #17788 from sivagollapalli/masterArthur Nogueira Neves2015-05-201-0/+5
|\ \ \ \
| * | | | Issue#17703 Test case for tempfile attributeSiva Gollapalli2015-04-161-0/+5
* | | | | Prefer assert_not over refuteRafael Mendonça França2015-05-182-2/+2
* | | | | ActionDispatch::Journey::Routes#empty? test casesValentine Valyaeff2015-05-193-1/+17
* | | | | Added ActionDispatch::Journey::Routes#empty?juggernaut-2015-05-181-0/+4
* | | | | [ci skip] remove `assigns` from the integration test example in API docsRoque Pinel2015-05-171-2/+2