aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into loofahRafael Mendonça França2014-08-12122-799/+1184
|\
| * Merge pull request #16476 from akshay-vishnoi/doc-changesRafael Mendonça França2014-08-122-2/+2
| |\
| | * use 'based on' instead of 'based off' [ci skip]Akshay Vishnoi2014-08-122-2/+2
| * | Nobody sucks so nobody should call this awful method nameRafael Mendonça França2014-08-121-1/+1
| |/
| * users_dont_suck_but_only_we_suck_and_only_our_tests_are_order_dependent!Akira Matsuda2014-08-121-0/+5
| * Merge pull request #16440 from tgxworld/pass_log_in_blockSantiago Pastorino2014-08-091-4/+6
| |\
| | * Pass block for logging.Guo Xiang Tan2014-08-091-4/+6
| * | Revert "Merge pull request #16434 from strzalek/cookies-digest-config-option"Santiago Pastorino2014-08-083-30/+2
| * | Add config option for cookies digestŁukasz Strzałkowski2014-08-083-2/+30
| * | Merge pull request #16427 from ryandao/full_stack_source_extractGuillermo Iguaran2014-08-089-69/+114
| |\ \
| | * | Update actionpack CHANGELOGRyan Dao2014-08-081-0/+5
| | * | Retrieve source code for the entire stack traceRyan Dao2014-08-088-69/+109
| | |/
| * / Fixes to TestCaseTest.Guo Xiang Tan2014-08-081-4/+5
| |/
| * Fix spelling.Guo Xiang Tan2014-08-071-1/+1
| * Remove ActionController::RaiseActionExceptions.Guo Xiang Tan2014-08-071-34/+0
| * refactor Redirecting so we do not need a controller instanceAaron Patterson2014-08-062-10/+7
| * call the routes method on enginesAaron Patterson2014-08-051-74/+37
| * a rails application should be an engine subclassAaron Patterson2014-08-051-1/+1
| * no reason to lazily instantiate the routesAaron Patterson2014-08-051-45/+42
| * just assign the instance variables on the testAaron Patterson2014-08-051-7/+3
| * avoid testing only_pathAaron Patterson2014-08-042-2/+5
| * Regenerate sid when sbdy tries to fixate the sessionSantiago Pastorino2014-08-042-12/+11
| * Using no_result_var in Journey's parser generatorJack Danger Canty2014-08-032-43/+33
| * Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-08-021-1/+2
| |\
| | * copy edits[ci skip]Vijay Dev2014-08-021-3/+1
| | * Performed Returns true if redirect/render has happenedGaurish Sharma2014-07-191-1/+4
| * | just set the host, no need for another hash allocation / merge!Aaron Patterson2014-08-011-1/+1
| * | always return a string from find_script_nameAaron Patterson2014-08-012-7/+9
| * | use `get` instead of accessing the named routes internalsAaron Patterson2014-07-311-1/+1
| * | invert check so we fail fasterAaron Patterson2014-07-311-1/+1
| * | do a hash lookup for collision detectionAaron Patterson2014-07-312-1/+5
| * | Realign assignments :scissors:Carlos Antonio da Silva2014-07-311-5/+5
| * | Do not reassign variable when mutation is happeningCarlos Antonio da Silva2014-07-311-8/+5
| * | Only concatenate path if it was given rather than converting blindlyCarlos Antonio da Silva2014-07-311-1/+1
| * | Rename variable to better show its intentCarlos Antonio da Silva2014-07-311-12/+12
| * | Simplify conditionalCarlos Antonio da Silva2014-07-311-3/+2
| * | Push options check up so we can simplify internal methodsCarlos Antonio da Silva2014-07-311-13/+10
| * | Simplify code branch, remove #tapCarlos Antonio da Silva2014-07-311-7/+6
| * | Avoid a new hash objectCarlos Antonio da Silva2014-07-311-1/+1
| * | Remove unnecessary call to #tapCarlos Antonio da Silva2014-07-311-5/+3
| * | remove useless deupAaron Patterson2014-07-301-1/+1
| * | push options inside the scope objectAaron Patterson2014-07-301-4/+9
| * | turn scope in to a linked listAaron Patterson2014-07-301-15/+36
| * | remove alias_method_chainAaron Patterson2014-07-301-4/+2
| * | avoid instrospection on the moduleAaron Patterson2014-07-301-1/+2
| * | fix variable nameAaron Patterson2014-07-301-3/+3
| * | split path_helpers and url_helpersAaron Patterson2014-07-301-18/+25
| * | `add` will remove the method if it exists alreadyAaron Patterson2014-07-301-1/+0
| * | Deprecate `*_path` methods in mailers@schneems and @sgrif2014-07-304-51/+97
| * | Revert "Merge pull request #15305 from tgxworld/remove_unnecessary_require"Santiago Pastorino2014-07-301-0/+1