aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #19094 from phoet/have_bearer_be_valid_as_wellRafael Mendonça França2015-06-013-2/+19
|\ | | | | Have Bearer be valid as well
| * 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
|\ \ | | | | | | Deprecate `assert_template` and `assigns()`.
| * | 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
|\ \ \ | |_|/ |/| | Move expectation to instance level.
| * | Replace expectation with state check.Kasper Timm Hansen2015-05-303-3/+9
| | | | | | | | | | | | The tests would still pass if the cache call in the rendered templates were removed.
* | | Use `any?` rather than `present?` to check argseileencodes2015-05-312-2/+2
| | | | | | | | | | | | | | | | | | It's better to use Ruby methods when possible over methods defined by Active Support because then it does not need to rely on any dependencies.
* | | match method doc fix [ci skip]Mehmet Emin İNAÇ2015-05-301-3/+6
| | | | | | | | | | | | | | | | | | match method without setting `:via` option has been deprecated fix minor typo
* | | [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.
| * | Remove unused code.Guo Xiang Tan2015-05-291-2/+0
| | | | | | | | | | | | Code was moved into the `assign` method.
* | | Fix warning about ambiguous first argumentArun Agrawal2015-05-291-1/+1
|/ /
* | Merge pull request #20341 from ↵Rafael Mendonça França2015-05-281-36/+0
|\ \ | | | | | | | | | | | | vngrs/remove_already_defined_methods_in_rack_request Remove already defined methods in super class of ActionDispatch::Request class
| * | Remove already defined methods in super class of ActionDispatch::Request classMehmet Emin İNAÇ2015-05-281-36/+0
| | | | | | | | | | | | | | | | | | | | | These methods had defined in 2004 by dhh in initial commit and `ActionDispatch::Request` class has been inherited from `Rack::Request` class in 2009 by josh. In 2014 these methods and more of them defined in `Rack::Request` class so we don't need them anymore in rails codebase.
* | | 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" filename
| * | | config.static_index configures directory index "index.html" filenameEliot Sykes2015-05-287-4/+31
| |/ / | | | | | | | | | | | | | | | Set `config.static_index` to serve a static directory index file not named `index`. For example, to serve `main.html` instead of `index.html` for directory requests, set `config.static_index` to `"main"`.
* | | Merge pull request #20331 from arunagw/arunagw-remove-unused-package-tasksRafael Mendonça França2015-05-281-7/+0
|\ \ \ | | | | | | | | Remove unused package tasks
| * | | Remove unused package tasksArun Agrawal2015-05-281-7/+0
| |/ / | | | | | | | | | We are using `all:build` now.
* / / Deprecate `:nothing` option for render methodMehmet Emin İNAÇ2015-05-2810-13/+28
|/ / | | | | | | `head` method works similar to `render` method with `:nothing` option
* | 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.
| * | 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
|\ \ \ | | | | | | | | [PoC] Stop shadowing parameters named `action`
| * | | Allow to parameters named `action` or `controller` from AC::TestCase helpersJean Boussier2015-04-182-15/+32
| | | |
* | | | Merge pull request #20316 from ↵Rafael Mendonça França2015-05-271-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vngrs/add_assertion_for_get_method_into_request_test Add assertion for get? method into test cases
| * | | | 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 task
| * | | | Remove broken and unused release taskArun Agrawal2015-05-221-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | - We do release with release.rb - There is no `rake/gemcutter`
* | | | | Add missing nodocs and docs for ActionDispatch::Request [ci skip]Mehmet Emin İNAÇ2015-05-261-3/+5
| | | | | | | | | | | | | | | | | | | | add missing dot to end of the doc
* | | | | 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
| | | | | | | | | | | | | | | | I should have deleted this earlier with 42e66fac38b54dd53d062fb5d3376218ed2ffdae
* | | | add a branch to eliminate multiple nil checksAaron Patterson2015-05-231-3/+5
| | | | | | | | | | | | | | | | | | | | if we add an else conditional to the `presence` check, we can eliminate the second `||` branch in the caller
* | | | move request id manipulation to the request objectAaron Patterson2015-05-222-7/+18
| | | | | | | | | | | | | | | | this way we can keep the knowledge of `env` hash keys in one place.
* | | | Spelling/typo/grammatical fixes [ci skip]karanarora2015-05-236-7/+7
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | spelling fix [ci skip] example to be consistent [ci skip] grammatical fix typo fixes [ci skip]
* | | Merge pull request #17788 from sivagollapalli/masterArthur Nogueira Neves2015-05-201-0/+5
|\ \ \ | | | | | | | | Issue#17703 Test case for tempfile attribute
| * | | Issue#17703 Test case for tempfile attributeSiva Gollapalli2015-04-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + To avoid regression I am adding this test case on action pack Changed to assert from assert_equal + Added msg to assertion Modified msg
* | | | 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
| | | | | | | | | | | | | | | | Based on #19976 and #18305.
* | | | Pass over CHANGELOGS [ci skip]Prathamesh Sonpatki2015-05-161-1/+1
| |_|/ |/| |
* | | Merge pull request #20113 from claudiob/remove-rails31-refsYves Senn2015-05-142-5/+4
|\ \ \ | | | | | | | | [ci skip] Remove comments about Rails 3.1
| * | | [ci skip] Remove comments about Rails 3.1claudiob2015-05-112-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stems from https://github.com/rails/rails/pull/20105#issuecomment-100900939 where @senny said: > From my point of view, all the docs (guides, API) are version bound. > They should describe that version and continue to be available when newer versions are released. > The cross referencing can be done by the interested user.
* | | | [ci skip] Don’t encourage `sudo gem install`claudiob2015-05-121-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I think we are better off leaving `sudo` outside of the documented way of installing gems (`activerecord`, `actionpack`, …). We don’t want newbies to think that `sudo` is required or, even worse, than they actually have to type `[sudo] gem install`. In most scenarios, `sudo` is not needed to install gems, and people who do need it, probably already know about it. What do you think? :grin:
* | | Move `TemplateAssertions` to their own fileeileencodes2015-05-092-188/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves `TemplateAssertions` out of the `test_case.rb` file and into it's own `template_assertions` file. It still inherits from `ActionController`.` This is in preparation for combining the code for Integration tests and Controller tests. This will need to be it's own file to be added to the `requires` for Integration tests. This does not currently change ANY behavior, just moving it for access later on.
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-05-081-1/+1
|\ \ \
| * | | Add missing "of" to RequestForgeryProtection doc.Hendy Tanata2015-04-271-1/+1
| | | | | | | | | | | | | | | | [ci skip]
* | | | [skip ci] Fix typos in actionpack changelog and security guideAnton Davydov2015-05-071-1/+1
| | | |