aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8882 from goshakkk/clearer-conditionalCarlos Antonio da Silva2013-01-111-3/+3
|\ | | | | Clearer conditional in constraint match check
| * clearer conditional in constraint match checkGosha Arinich2013-01-101-3/+3
| |
* | Fix json params parsing regression for non-object JSON content.Dylan Smith2013-01-111-2/+2
|/ | | | Fixes #8845.
* extract PerformanceTest into rails-performance_tests gemYves Senn2013-01-101-10/+0
|
* adding missing requiresAaron Patterson2013-01-092-0/+9
|
* Merge pull request #8824 from mjtko/fix/cookie-store-inheritanceSantiago Pastorino2013-01-082-5/+26
|\ | | | | Modify CookieStore middleware inheritance to avoid subclassing Rack::Session::Cookie [Fix for #7372]
| * Revert cb3181e - no longer required.Mark J. Titorenko2013-01-081-2/+0
| |
| * Fix CookieStore middleware inheritance hierarchy s.t. it inherits from ↵Mark J. Titorenko2013-01-081-3/+26
| | | | | | | | Rack::Session::Abstract::ID rather than Rack::Session::Cookie.
* | remove yaml as a param parser :burn:Aaron Patterson2013-01-081-2/+0
| | | | | | | | | | If you revert this commit, I will hunt you down, I will make you regret ever terrible thing you've ever done, I will make you suffer.
* | * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * ↵Aaron Patterson2013-01-082-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | dealing with empty hashes. Thanks Damien Mathieu Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_dispatch/http/request.rb actionpack/lib/action_dispatch/middleware/params_parser.rb activerecord/CHANGELOG.md activerecord/lib/active_record/relation/predicate_builder.rb activerecord/test/cases/relation/where_test.rb
* | Revert "Merge branch 'master-sec'"Jeremy Kemper2013-01-082-6/+5
| | | | | | | | | | This reverts commit 88cc1688d0cb828c17706b41a8bd27870f2a2beb, reversing changes made to f049016cd348627bf8db0d72382d7580bf802a79.
* | Merge branch 'master-sec'Aaron Patterson2013-01-082-5/+6
|\ \ | | | | | | | | | | | | | | | * master-sec: CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealing with empty hashes. Thanks Damien Mathieu
| * | * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * ↵Aaron Patterson2013-01-072-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dealing with empty hashes. Thanks Damien Mathieu Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_dispatch/http/request.rb actionpack/lib/action_dispatch/middleware/params_parser.rb activerecord/CHANGELOG.md activerecord/lib/active_record/relation/predicate_builder.rb activerecord/test/cases/relation/where_test.rb
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-01-092-9/+17
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: guides/source/getting_started.md
| * | | extract alert= and notice= examples to FlashHash#now [ci skip]Francesco Rodriguez2013-01-031-17/+15
| | | |
| * | | Add examples `alert=` and `notice=`, using memeslambda_2013-01-031-0/+10
| | | |
| * | | Change `Example for` to `Example of`lambda_2013-01-031-2/+2
| | | |
* | | | Eliminate Rack::File headers deprecation warningSam Ruby2013-01-081-1/+1
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://intertwingly.net/projects/AWDwR4/checkdepot/section-6.1.html rake test produces: "Rack::File headers parameter replaces cache_control after Rack 1.5." Despite what the message says, it appears that the hearders parameter change will be effective as of Rack 1.5: https://github.com/rack/rack/blob/rack-1.4/lib/rack/file.rb#L24 https://github.com/rack/rack/blob/master/lib/rack/file.rb#L24
* | | Avoid Rack security warning no secret providedSantiago Pastorino2013-01-081-0/+2
| |/ |/| | | | | This avoids "SECURITY WARNING: No secret option provided to Rack::Session::Cookie."
* | access `@path` and `@routes` via reader methods in journeyGosha Arinich2013-01-072-3/+3
| |
* | refactor ShowExceptions' #call to use def-rescue instead of begin-rescueGosha Arinich2013-01-071-7/+4
| |
* | remove begin-rescue in favor of def-rescueGosha Arinich2013-01-071-10/+9
| |
* | Fix operators precedence issueRafael Mendonça França2013-01-061-1/+1
| |
* | Merge pull request #8787 from tank-bohr/masterRafael Mendonça França2013-01-061-2/+2
|\ \ | | | | | | masgn and response variable
| * | return multiple assingment and response variabletank-bohr2013-01-071-2/+2
| | |
* | | Merge pull request #8785 from goshakkk/refactor-debug-exceptionsRafael Mendonça França2013-01-061-2/+1
|\ \ \ | |/ / |/| | Refactor DebugExceptions
| * | refactor DebugExceptions by combining two conditionals into oneGosha Arinich2013-01-071-2/+1
| | |
* | | Reduce number of Strings a bitAkira Matsuda2013-01-071-3/+3
| | |
* | | Namespace HashWithIndifferentAccessAkira Matsuda2013-01-072-2/+2
|/ /
* | Merge pull request #8783 from goshakkk/refactor-journey-routesRafael Mendonça França2013-01-061-12/+11
|\ \ | | | | | | Refactor Journey::Routes
| * | refactor Journey::RoutesGosha Arinich2013-01-071-12/+11
| | | | | | | | | | | | | | | * prefer do-end for multiline blocks * prefer or-equals over returns with checks
* | | fix for rbxtank-bohr2013-01-071-2/+2
|/ / | | | | | | | | | | | | | | | | Rubinius returns a boolean after such assingment response = (_, headers, body = @app.call(env)) see https://github.com/rubinius/rubinius/issues/2117 get rid of a local variable
* | Needless requiresAkira Matsuda2013-01-061-4/+0
| |
* | Missing requiresAkira Matsuda2013-01-061-0/+1
| |
* | Rename route_wrapper partial layout to tableCarlos Antonio da Silva2013-01-062-1/+1
| | | | | | | | | | | | It is used by the table formatter only, and it's already inside a routes directory that namespaces it properly, so calling it just "table" seems simpler.
* | Move table routes formatter class to the inspector and rename itCarlos Antonio da Silva2013-01-063-19/+19
| | | | | | | | | | | | | | It feels more consistent to have this class called "HtmlTableFormatter", and to have it here with the routes inspector and console formatter, since it's used for both routing error exceptions and the rails info page.
* | Refactor to not call path.ast twiceCarlos Antonio da Silva2013-01-061-2/+3
| |
* | refactor Route#ast to use or-equals and block, instead of return with a condGosha Arinich2013-01-061-5/+4
| |
* | Remove unnecessary begin..rescue..end, use only rescueAkira Matsuda2013-01-061-5/+3
| |
* | Merge pull request #8766 from jcoglan/session_token_docsAndrew White2013-01-051-7/+4
|\ \ | | | | | | | | | | | | Remove suggestion that Procs can be used as session secrets. [ci skip]
| * | Remove suggestion that Procs can be used as session secrets.James Coglan2013-01-051-7/+4
| | |
* | | Remove warning, remove not used variable, and make methods privateCarlos Antonio da Silva2013-01-051-3/+5
|/ / | | | | | | Warning: "shadowing outer local variable - routes".
* | Close container div tag in routing error pageCarlos Antonio da Silva2013-01-051-9/+11
| |
* | Move style to head to make routes page valid html5Carlos Antonio da Silva2013-01-052-4/+6
| |
* | display mountable engine routes on RoutingError.Yves Senn2013-01-052-8/+23
| |
* | split formatting concerns from RoutesInspectorYves Senn2013-01-051-20/+42
| |
* | Allow use of durations for ActionDispatch::SSL configurationAndrew White2013-01-041-1/+1
| |
* | Remove unnecessary `ERB::Util::h`Ryunosuke SATO2013-01-057-17/+17
| | | | | | | | It is automatically applied when strings is unsafe for html.
* | Suppress warning about IO#lines in Ruby 2.0Ryunosuke SATO2013-01-041-1/+1
| | | | | | | | actionpack/lib/action_dispatch/middleware/exception_wrapper.rb:99: IO#lines is deprecated; use #each_line instead
* | Merge pull request #8723 from goshakkk/refactor-error-pageGuillermo Iguaran2013-01-033-5/+27
|\ \ | | | | | | Move error page js into script tag