aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Fix undefined error for `ActionController::Parameters`Jon Moss2016-01-261-6/+3
| | | |
* | | | clear view path cache between testsAaron Patterson2016-01-261-0/+5
|/ / / | | | | | | | | | | | | | | | | | | | | | The cache for `render file:` seems to also be used in the case of `render(string)`. If one is supposed to be a hit and the other is supposed to be a miss, and they both reference the same file, then the cache could return incorrect values. This commit clears the cache between runs so that we get non-cached behavior.
* | | Merge branch '5-0-beta-sec'Aaron Patterson2016-01-255-5/+61
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 5-0-beta-sec: bumping version fix version update task to deal with .beta1.1 Eliminate instance level writers for class accessors allow :file to be outside rails root, but anything else must be inside the rails view directory Don't short-circuit reject_if proc stop caching mime types globally use secure string comparisons for basic auth username / password
| * | | bumping versionAaron Patterson2016-01-251-1/+1
| | | |
| * | | allow :file to be outside rails root, but anything else must be inside the ↵Aaron Patterson2016-01-222-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | rails view directory CVE-2016-0752
| * | | stop caching mime types globallyAaron Patterson2016-01-221-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Unknown mime types should not be cached globally. This global cache leads to a memory leak and a denial of service vulnerability. CVE-2016-0751
| * | | use secure string comparisons for basic auth username / passwordAaron Patterson2016-01-221-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | this will avoid timing attacks against applications that use basic auth. CVE-2015-7576
* | | | Fix nodoc to internal class error document some of themVipul A M2016-01-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Fixes #20808 [Vipul A M & Julio Lopez]
* | | | rm changelog for unreleased changes fixesVipul A M2016-01-221-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | Based on https://github.com/rails/rails/pull/23167/files#r50507317 [ci skip]
* | | | Merge pull request #23167 from maclover7/fix-21032Rafael França2016-01-213-1/+15
|\ \ \ \ | | | | | | | | | | Fix `ActionController::Parameters#==` bug
| * | | | Fix `ActionController::Parameters#==` bugJon Moss2016-01-213-1/+15
| | | | | | | | | | | | | | | | | | | | See bug #21032.
* | | | | - Fix warning introduced in ↵Vipul A M2016-01-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/vipulnsward/rails/commit/77acc004efad07dfd4d4f83be14ef897968a3fd9 when fixing API responses. - render :text is deprecated, so added an assertion for it.
* | | | | remove doc reference to ActionController::MimeResponds#respond_tosealocal2016-01-201-3/+0
| | | | |
* | | | | document simple example of ActionController::MimeResponds#respond_tosealocal2016-01-201-1/+9
| | | | |
* | | | | Re-add ActionController::ApiRenderingJon Moss2016-01-204-1/+39
|/ / / / | | | | | | | | | | | | | | | | - Fixes bug #23142. - Bug was occurring only with ActionController::API, because `_process_options` wasn't being run for API requests, even though it was being run for normal app requests.
* | | | Merge pull request #23140 from rails/fix-search-for-custom-routesAaron Patterson2016-01-202-14/+83
|\ \ \ \ | | | | | | | | | | Fix marking of custom routes for Journey
| * | | | Fix marking of custom routes for JourneyAndrew White2016-01-202-14/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Mapper build_path method marks routes where path parameters are part of a path segment as custom routes by altering the regular expression, e.g: get '/foo-:bar', to: 'foo#bar' There were some edge cases where certain constructs weren't being picked up and this commit fixes those. Fixes #23069.
* | | | | Merge pull request #17573 from zerothabhishek/masterGodfrey Chan2016-01-205-10/+18
|\ \ \ \ \ | |/ / / / |/| | | | Response etags to always be weak: Prefixed 'W/' to value returned by Act...
| * | | | Response etags to always be weak: Prefixed W/ to value returned by ↵abhishek2016-01-205-10/+18
| | | | | | | | | | | | | | | | | | | | ActionDispatch::Http::Cache::Response#etag= such that etags set in fresh_when and stale? are weak. For #17556.
* | | | | Revert "Remove literal? check to fix issue with prefixed optionals"eileencodes2016-01-202-13/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5d1b7c3b441654e8008dcd303f5367883ec660a6. The change here didn't actually fix the issue it was trying to fix, and this isn't the correct way to fix either issue. The problem is switching from the builder to grouping with find_all/regex is now very dependent on how you structure your path pattern.
* | | | Revert "Its ideal to set Vary: Accept-Encoding, irrespective of whether ↵schneems2016-01-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gzipped version exists or not. This is helpful for CDN's to later distinguish assets, based on previous, current copies and introduced gzip version if any." This reverts commit 067c52f608568e35181830a5c1016e382650e655. Conversation: https://github.com/rails/rails/pull/23120#issuecomment-173007011
* | | | Merge pull request #23120 from vipulnsward/always-set-vary-for-static-assetsRichard Schneeman2016-01-192-2/+2
|\ \ \ \ | | | | | | | | | | Its ideal to set Vary: Accept-Encoding, irrespective of whether gzipped or not
| * | | | Its ideal to set Vary: Accept-Encoding, irrespective of whether gzipped ↵Vipul A M2016-01-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | version exists or not. This is helpful for CDN's to later distinguish assets, based on previous, current copies and introduced gzip version if any. For ref: https://www.fastly.com/blog/best-practices-for-using-the-vary-header This change sets `Vary` header always, to be on safer side
* | | | | Link to docs instead of listing methodsschneems2016-01-191-5/+7
| | | | |
* | | | | Add methods to StrongParametersschneems2016-01-192-2/+9
| | | | | | | | | | | | | | | It's reasonable to expose different value readers.
* | | | | [close #23084] Deprecated StrongParametersschneems2016-01-192-0/+22
|/ / / / | | | | | | | | | | | | We can provide a more flexible upgrade experience by warning users they are using unsafe methods instead of forcing the safe API by deprecating before removal. This PR provides this functionality.
* | | | Pass through AP CHANGELOG [ci skip]Vipul A M2016-01-181-2/+2
| | | |
* | | | Remove literal? check to fix issue with prefixed optionalseileencodes2016-01-162-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit d993cb3 `build_path` was changed from using `grep` to `find_all` to save array allocations. This change was a little too aggressive in that when the dash comes before the symbol like `/omg-:song` the symbol is skipped. Removing the check for `n.right.left.literal?` fixes this issue, but does add back some allocations. The number of allocations are still well less than before. I've added a regression test to test this behavior for the future. Fixes #23069. Array allocations as of d993cb3: ``` {:T_SYMBOL=>11} {:T_REGEXP=>17} {:T_STRUCT=>6500} {:T_MATCH=>12004} {:T_OBJECT=>91009} {:T_DATA=>100088} {:T_HASH=>114013} {:T_STRING=>159637} {:T_ARRAY=>321056} {:T_IMEMO=>351133} ``` Array allocations after this change: ``` {:T_SYMBOL=>11} {:T_REGEXP=>1017} {:T_STRUCT=>6500} {:T_MATCH=>12004} {:T_DATA=>84092} {:T_OBJECT=>87009} {:T_HASH=>110015} {:T_STRING=>166152} {:T_ARRAY=>322056} {:T_NODE=>343558} ```
* | | | Merge pull request #22985 from akshay-vishnoi/fix-typoRafael França2016-01-161-1/+1
|\ \ \ \ | | | | | | | | | | test `include?`- fix typo
| * | | | test `include?`- fix typoAkshay Vishnoi2016-01-091-1/+1
| | | | |
* | | | | Fix typo in docs [ci skip]Rebecca Skinner2016-01-141-2/+2
| | | | |
* | | | | Space OddityAkira Matsuda2016-01-143-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Converting nbsp(\u{00A0}) to the normal ASCII space(\u{0020}) [ci skip]
* | | | | docs, formatting pass over changelogs. [ci skip]Yves Senn2016-01-131-4/+4
| | | | |
* | | | | do not run in parallel on travisAaron Patterson2016-01-121-1/+5
| | | | |
* | | | | remove `present?` callsAaron Patterson2016-01-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Empty strings / data structures should be treated differently than nils. We don't really need these calls here (don't pass in blank strings).
* | | | | monkey patch `recycle!` on to controllers onceAaron Patterson2016-01-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of checking whether the class has recycle! or not, we can just always add the method to all controller classes when the test harness is loaded. Technically this means that the controller test harness will not work with controllers that do not inherit from AC::Metal, but then, I'm not sure that is supported anyway. Mixing in the module one will ensure that we don't break method caches, and eliminates a runtime check so it should speed up tests (slightly).
* | | | | Merge pull request #22935 from cllns/add-status-name-to-outputRafael França2016-01-125-17/+84
|\ \ \ \ \ | | | | | | | | | | | | Add HTTP status name to output of tests
| * | | | | Add both HTTP Response Code and Type to assertion messagesSean Collins2016-01-125-17/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, refactor logic to convert between symbol and response code, via the AssertionResponse class
* | | | | | Merge pull request #23035 from jkowens/fix-null-byteRafael França2016-01-122-1/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Prevent static middleware from attempting to serve a request with a null byte
| * | | | | | Prevent attempt to serve a request with a null byteJordan Owens2016-01-122-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | File paths cannot contain null byte characters and methods that do path operations such as Rack::Utils#clean_path_info will raise unwanted errors.
* | | | | | | AC::Parameters#at_json: restore Rails 4.2’s valueclaudiob2016-01-122-1/+8
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #23026 See discussion at #23026
* | | | | | Commit before freezing the headersMatthew Draper2016-01-123-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This shouldn't generally come up: under a standard flow, we don't start sending until after the commit. But application code always finds a way.
* | | | | | Unneeded &block parametersAkira Matsuda2016-01-121-2/+2
| | | | | |
* | | | | | Merge pull request #21181 from denisenkom/mypatchKasper Timm Hansen2016-01-101-0/+19
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Test basic auth with symbols in password
| * | | | | Test basic auth with symbols in login and passwordMikhail Denisenko2015-10-241-0/+19
| | | | | |
* | | | | | [ci skip] Fix typo Renderering --> RenderingAkshay Vishnoi2016-01-091-1/+1
| | | | | |
* | | | | | Fix typo in ActionPack CHANGELOG [ci skip]Prathamesh Sonpatki2016-01-081-1/+1
| | | | | |
* | | | | | add gregBen Toews2016-01-071-1/+1
| | | | | |
* | | | | | Better error message when running `rake routes` with CONTROLLER arg:Edouard CHIN2016-01-073-7/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - `CONTROLLER` argument can now be supplied in different ways (Rails::WelcomeController, Rails::Welcome, rails/welcome) - If `CONTROLLER` argument was supplied but it does not exist, will warn the user that this controller does not exist - If `CONTROLLER` argument was supplied and no routes could be found matching this filter, will warn the user that no routes were found matching the supplied filter - If no routes were defined in the config/routes.rb file, will warn the user with the original message
* | | | | | Merge pull request #20109 from prathamesh-sonpatki/keep-only-one-rootKasper Timm Hansen2016-01-071-21/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove original root method from Base module and kept overridden implementation in Resources module.