aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* No variant should also be picked up by variant.any if variant.none is not ↵David Heinemeier Hansson2014-02-132-1/+5
| | | | defined (just like any other variant)
* Check if variant array contains only symbolsŁukasz Strzałkowski2014-02-132-2/+10
|
* Variant negotiationLukasz Strzalkowski2014-02-134-11/+50
| | | | | | | | | | | | | | Allow setting `request.variant` as an array - an order in which they will be rendered. For example: request.variant = [:tablet, :phone] respond_to do |format| format.html.none format.html.phone # this gets rendered end
* rm warning about variable shadowingGodfrey Chan2014-02-111-2/+2
|
* Migrate hash-based cookie values correctlyGodfrey Chan2014-02-111-2/+4
|
* Updated CHANGELOG, docs, guides and release notes.Godfrey Chan2014-02-111-15/+14
| | | | Also added a `cookies_serializer.rb` initializer to the app template.
* Added changelog entry for Flash changes [ci skip]Godfrey Chan2014-02-111-0/+4
|
* Missed FlashHash#replaceGodfrey Chan2014-02-111-1/+1
|
* Fixed broken flash testsGodfrey Chan2014-02-112-5/+5
|
* Re-write legacy (marshal) cookies on readGodfrey Chan2014-02-112-35/+57
|
* Stringify the incoming hash in FlashHashGuillermo Iguaran2014-02-111-1/+3
| | | | | Stringify the incoming as well to handle incoming symbol keys from marshalled sessions
* Convert FlashHash in a Hash with indifferent accessGuillermo Iguaran2014-02-112-4/+25
|
* Changed the tests to ensure HybridSerializer actually migrates the cookies ↵Godfrey Chan2014-02-111-10/+18
| | | | (currently failing)
* Fixed minor typo in test codeGodfrey Chan2014-02-111-1/+1
|
* Tests for the HybridSerializerRafael Mendonça França2014-02-111-0/+68
|
* Removed an old testGodfrey Chan2014-02-111-5/+0
|
* Added HybridSerializer to upgrade existing marshal cookies (wip: need tests)Godfrey Chan2014-02-111-0/+14
|
* Just very so slightly better test coverageGodfrey Chan2014-02-111-15/+57
|
* Renamed session_serializer option to cookies_serializerGodfrey Chan2014-02-115-50/+36
|
* docs, link to HTTP and CGI header definitions. [ci skip]Yves Senn2014-02-101-1/+1
| | | | This was a reaction to: https://github.com/rails/rails/pull/9700#issuecomment-34550210
* Set the :shallow_path as each scope is generatedAndrew White2014-02-093-1/+95
| | | | | | | | | | | | | | | | If we set :shallow_path when shallow is called it can result in incorrect paths if the resource is inside a namespace because namespace itself sets the :shallow_path option to the namespace path. We fix this by removing the :shallow_path option from shallow as that should only be turning shallow routes on and not otherwise affecting the scope. To do this we need to treat the :shallow option to resources differently to other scope options and move it to before the nested block is called. This change also has the positive side effect of making the behavior of the :shallow option consistent with the shallow method. Fixes #12498.
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-02-091-3/+3
|\ | | | | | | | | | | | | Conflicts: guides/source/active_record_validations.md guides/source/api_documentation_guidelines.md guides/source/configuring.md
| * add punctuationWaynn Lue2014-01-131-2/+2
| |
| * change to "check out"Waynn Lue2014-01-081-1/+1
| |
* | Merge pull request #13982 from dskang/fix-response-flatten-infinite-recursionAaron Patterson2014-02-092-1/+19
|\ \ | | | | | | Fix response flatten infinite recursion
| * | Prevent [response].flatten from recursing infinitely.Dan Kang2014-02-082-1/+10
| | | | | | | | | | | | | | | | | | Returning `self` from within the array returned by `to_ary` caused this. Instead, we can just substitute another object. It provides the `each` behavior required by the rack spec.
| * | Add missing test for response destructuring.Myron Marston2014-02-081-0/+9
| | |
* | | Merge pull request #13990 from zzak/ap_dont_autoload_filter_parametersRafael Mendonça França2014-02-091-1/+0
|\ \ \ | | | | | | | | FilterParameters is referenced at the class level from the Request
| * | | FilterParameters is referenced at the class level from the RequestZachary Scott2014-02-091-1/+0
| |/ / | | | | | | | | | | | | Since it's already required in the file, we don't need to use autoload too. This commit is symmetrical change to 0b10180 for Response.
* | | Merge pull request #13985 from zzak/remove_old_todo_in_url_for_testCarlos Antonio da Silva2014-02-091-3/+0
|\ \ \ | | | | | | | | Remove outdated TODO from url_for test, this test was fixed in 900a2d30
| * | | Remove outdated TODO from url_for test, this test was fixed in 900a2d30Zachary Scott2014-02-091-3/+0
| |/ /
* | | use File.exist? instead of File.exists?SHIBATA Hiroshi2014-02-091-1/+1
| | |
* | | Skips tests on Windows that create files with illegal charactersMikko Johansson2014-02-091-2/+7
|/ /
* | Updated the cookie docs to use the safer JSON.{generate,parse}Godfrey Chan2014-02-081-5/+5
| | | | | | | | cc @senny
* | Rely on backticks instead of tt tags [ci skip]Robin Dupret2014-02-081-2/+2
| | | | | | | | | | Since the language in code blocks is inferred, if the code contains tt tags, the block will be parsed as XML for instance while it is Ruby.
* | docs, Cookie values are String based. Closes #12860. [ci skip]Yves Senn2014-02-081-7/+7
| |
* | Require action_view to fix missing constantPhilipe Fatio2014-02-072-0/+6
| | | | | | | | | | Previously, requiring action_view/view_paths did cause an uninitialized constant error for ENCODING_FLAG, which is defined in action_view.
* | Tests that skips a controller filters that was set up using a classIonatan Wiznia2014-02-061-0/+16
| |
* | synchronize 4.1 release notes with CHANGELOGS. [ci skip]Yves Senn2014-02-061-1/+1
| | | | | | | | /cc @chancancode
* | Merge pull request #13863 from joshjordan/jsj-dont-throw-out-get-paramsRafael Mendonça França2014-02-013-4/+36
|\ \ | | | | | | | | | | | | | | | | | | Do not discard query parameters on requests that use wrap_parameters Conflicts: actionpack/CHANGELOG.md
| * | Do not discard query parameters on requests that use wrap_parametersJosh Jordan2014-01-303-4/+36
| | |
* | | only ask for the location filters onceAaron Patterson2014-01-311-4/+5
| | |
* | | FilterRedirect is referenced at the class level from the ResponseAaron Patterson2014-01-312-1/+1
| | | | | | | | | | | | | | | We can just require the file rather than going through the autoload indirection
* | | tidy CHANGELOGs [ci skip]Yves Senn2014-01-301-2/+2
| | |
* | | Modify the session serializer implementationGuillermo Iguaran2014-01-303-19/+16
| | | | | | | | | | | | | | | Rename allowed options to :marshal and :json, for custom serializers only allow the use of custom classes.
* | | Update CHANGELOG properly with GH #13692 [ci-skip]Guillermo Iguaran2014-01-291-14/+14
| | |
* | | Allow session serializer key in config.session_storeLukasz Sarnacki2014-01-296-6/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MessageEncryptor has :serializer option, where any serializer object can be passed. This commit make it possible to set this serializer from configuration level. There are predefined serializers (:marshal_serializer, :json_serialzier) and custom serializer can be passed as String, Symbol (camelized and constantized in ActionDispatch::Session namepspace) or serializer object. Default :json_serializer was also added to generators to provide secure defalt.
* | | always use a block for cleanup / prepare callbacks so we can clean the ↵Aaron Patterson2014-01-281-0/+9
| | | | | | | | | | | | method signature
* | | scope is not necessaryAaron Patterson2014-01-281-2/+2
| | |
* | | Log which keys were set to nil in deep_mungeLukasz Sarnacki2014-01-283-4/+26
|/ / | | | | | | | | | | | | | | deep_munge solves CVE-2013-0155 security vulnerability, but its behaviour is definately confuisng. This commit adds logging to deep_munge. It logs keys for which values were set to nil. Also mentions in guides were added.