aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Use `#bytesize` instead of `#size` when checking for cookie overflowAgis-2014-07-112-2/+7
* Synced 4.2 release notes with the latest commits.Godfrey Chan2014-07-111-0/+2
* Removed single space padding from empty response body.Godfrey Chan2014-07-106-22/+32
* Merge branch 'rosetta_flash' of https://github.com/gcampbell/rails into gcamp...Aaron Patterson2014-07-104-3/+8
|\
| * Address CVE-2014-4671 (JSONP Flash exploit)Greg Campbell2014-07-094-3/+8
* | Force encoding of US-ASCII to UTF-8 in unescape_uri.Karl Entwistle2014-07-103-5/+21
* | Merge pull request #16091 from tgxworld/reduce_creation_of_subscribersSantiago Pastorino2014-07-091-17/+13
|\ \ | |/ |/|
| * Reduce number of subscriptions created.Guo Xiang Tan2014-07-081-17/+13
* | Fix weird comment. [CI SKIP]Guo Xiang Tan2014-07-091-2/+2
* | Merge pull request #13999 from jamox/update_rackAaron Patterson2014-07-085-20/+29
|\ \ | |/ |/|
| * Since upgrading rack we can remove unnecessary string encodingsJarmo Isotalo2014-05-191-9/+2
| * Upgraded rackJarmo Isotalo2014-05-194-11/+27
* | remove the mounted_helpers respond_to checkAaron Patterson2014-07-071-1/+1
* | always test against a routed rack app so there are always url_helpersAaron Patterson2014-07-075-36/+66
* | Generate shallow paths for all children of shallow resources.Seb Jacobs2014-07-063-2/+29
* | Merge pull request #16013 from tgxworld/remove_symbolized_path_parametersRafael Mendonça França2014-07-045-10/+10
|\ \
| * | Remove symbolized_path_parameters.Guo Xiang Tan2014-07-025-10/+10
* | | Merge pull request #16011 from xjlu/token_and_optionsRafael Mendonça França2014-07-042-3/+23
|\ \ \
| * | | Improve token_and_options regex and testXinjiang Lu2014-07-012-3/+23
* | | | [ci skip] /javascript/ -> JavaScript - cover whole appAkshay Vishnoi2014-07-041-1/+1
* | | | Change the JSON renderer to enforce the 'JS' Content TypeLucas Mazza2014-07-023-1/+24
| |/ / |/| |
* | | Fix typoRafael Mendonça França2014-07-021-1/+1
* | | flash doesn't pass objects #15522 [ci skip]Nishant Modak2014-07-011-3/+6
|/ /
* | makes it sound less misleadingShunsukeAida2014-07-021-2/+2
* | Fix doc unwanted dl Admin:: [ci skip]Ciro Santilli2014-07-011-1/+1
* | push host / port / protocol extraction upAaron Patterson2014-06-301-6/+6
* | Merge pull request #15933 from rafael/masterRafael Mendonça França2014-06-274-5/+59
|\ \
| * | Improvements per code review.Rafael Chacón2014-06-272-4/+32
| * | Add always_permitted_parameters as an option.Rafael Chacón2014-06-262-5/+25
* | | Merge pull request #15836 from DNNX/router-swap-select-sortRafael Mendonça França2014-06-241-1/+2
|\ \ \
| * | | Replace x.sort_by!.select! with x.select!.sort_by!Viktar Basharymau2014-06-201-1/+2
* | | | `:nodoc: all` does not remove the constants from the API. [ci skip]Yves Senn2014-06-241-1/+1
|/ / /
* | | Merge pull request #15537 from tgxworld/fix_state_leakMatthew Draper2014-06-204-5/+5
|\ \ \
| * | | Remove redundant code.Guo Xiang Tan2014-06-051-4/+0
| * | | Prevent state leak.Guo Xiang Tan2014-06-054-1/+5
* | | | add both branches to the only_path conditionalAaron Patterson2014-06-191-6/+6
* | | | Relpace `=~ Regexp.new str` with `.include? str` in AC::Base#_valid_action_name?Viktar Basharymau2014-06-191-1/+1
* | | | [ci skip] /javascript/ ~> JavaScriptAditya Kapoor2014-06-171-3/+3
* | | | Merge pull request #15744 from mmozuras/special_keys_setYves Senn2014-06-161-1/+1
|\ \ \ \
| * | | | Change Http::Cache::SPECIAL_KEYS from Array to SetMindaugas Mozūras2014-06-151-1/+1
* | | | | Merge pull request #15743 from tgxworld/remove_unused_parametersYves Senn2014-06-161-1/+1
|\ \ \ \ \
| * | | | | Remove unused parameter.Guo Xiang Tan2014-06-151-1/+1
| |/ / / /
* / / / / Remove unused param 'separators' from RouteSet#build_pathMindaugas Mozūras2014-06-151-2/+2
|/ / / /
* | | | Fix request's path_info when a rack app mounted at '/'.Larry Lv2014-06-143-0/+14
* | | | Merge pull request #15692 from sromano/falseClassMatthew Draper2014-06-143-2/+29
|\ \ \ \
| * | | | ActionController::Parameters#require now accepts FalseClass valuesSergio Romano2014-06-133-1/+24
|/ / / /
* | | | Merge pull request #15682 from tgxworld/controller_test_processRafael Mendonça França2014-06-131-2/+5
|\ \ \ \
| * | | | Set flash in test session when necessary.Guo Xiang Tan2014-06-121-2/+5
* | | | | Fix parsed token value with header `Authorization token=`.Larry Lv2014-06-133-8/+32
* | | | | Set the status before of setting the response bodyGuillermo Iguaran2014-06-131-2/+2
|/ / / /