Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #8882 from goshakkk/clearer-conditional | Carlos Antonio da Silva | 2013-01-11 | 1 | -3/+3 | |
|\ \ | | | | | | | Clearer conditional in constraint match check | |||||
| * | | clearer conditional in constraint match check | Gosha Arinich | 2013-01-10 | 1 | -3/+3 | |
| | | | ||||||
* | | | Fix json params parsing regression for non-object JSON content. | Dylan Smith | 2013-01-11 | 1 | -2/+2 | |
|/ / | | | | | | | Fixes #8845. | |||||
* | | extract PerformanceTest into rails-performance_tests gem | Yves Senn | 2013-01-10 | 1 | -10/+0 | |
| | | ||||||
* | | adding missing requires | Aaron Patterson | 2013-01-09 | 2 | -0/+9 | |
| | | ||||||
* | | Merge pull request #8824 from mjtko/fix/cookie-store-inheritance | Santiago Pastorino | 2013-01-08 | 2 | -5/+26 | |
|\ \ | | | | | | | Modify CookieStore middleware inheritance to avoid subclassing Rack::Session::Cookie [Fix for #7372] | |||||
| * | | Revert cb3181e - no longer required. | Mark J. Titorenko | 2013-01-08 | 1 | -2/+0 | |
| | | | ||||||
| * | | Fix CookieStore middleware inheritance hierarchy s.t. it inherits from ↵ | Mark J. Titorenko | 2013-01-08 | 1 | -3/+26 | |
| | | | | | | | | | | | | Rack::Session::Abstract::ID rather than Rack::Session::Cookie. | |||||
* | | | remove yaml as a param parser :burn: | Aaron Patterson | 2013-01-08 | 1 | -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 Patterson | 2013-01-08 | 2 | -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 Kemper | 2013-01-08 | 2 | -6/+5 | |
| | | | | | | | | | | | | | | | This reverts commit 88cc1688d0cb828c17706b41a8bd27870f2a2beb, reversing changes made to f049016cd348627bf8db0d72382d7580bf802a79. | |||||
* | | | Merge branch 'master-sec' | Aaron Patterson | 2013-01-08 | 2 | -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 Patterson | 2013-01-07 | 2 | -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/docrails | Vijay Dev | 2013-01-09 | 2 | -9/+17 | |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: guides/source/getting_started.md | |||||
| * | | | extract alert= and notice= examples to FlashHash#now [ci skip] | Francesco Rodriguez | 2013-01-03 | 1 | -17/+15 | |
| | | | | ||||||
| * | | | Add examples `alert=` and `notice=`, using memes | lambda_ | 2013-01-03 | 1 | -0/+10 | |
| | | | | ||||||
| * | | | Change `Example for` to `Example of` | lambda_ | 2013-01-03 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Eliminate Rack::File headers deprecation warning | Sam Ruby | 2013-01-08 | 1 | -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 provided | Santiago Pastorino | 2013-01-08 | 1 | -0/+2 | |
| |/ |/| | | | | | This avoids "SECURITY WARNING: No secret option provided to Rack::Session::Cookie." | |||||
* | | access `@path` and `@routes` via reader methods in journey | Gosha Arinich | 2013-01-07 | 2 | -3/+3 | |
| | | ||||||
* | | refactor ShowExceptions' #call to use def-rescue instead of begin-rescue | Gosha Arinich | 2013-01-07 | 1 | -7/+4 | |
| | | ||||||
* | | remove begin-rescue in favor of def-rescue | Gosha Arinich | 2013-01-07 | 1 | -10/+9 | |
| | | ||||||
* | | Fix operators precedence issue | Rafael Mendonça França | 2013-01-06 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #8787 from tank-bohr/master | Rafael Mendonça França | 2013-01-06 | 1 | -2/+2 | |
|\ \ | | | | | | | masgn and response variable | |||||
| * | | return multiple assingment and response variable | tank-bohr | 2013-01-07 | 1 | -2/+2 | |
| | | | ||||||
* | | | Merge pull request #8785 from goshakkk/refactor-debug-exceptions | Rafael Mendonça França | 2013-01-06 | 1 | -2/+1 | |
|\ \ \ | |/ / |/| | | Refactor DebugExceptions | |||||
| * | | refactor DebugExceptions by combining two conditionals into one | Gosha Arinich | 2013-01-07 | 1 | -2/+1 | |
| | | | ||||||
* | | | Reduce number of Strings a bit | Akira Matsuda | 2013-01-07 | 1 | -3/+3 | |
| | | | ||||||
* | | | Namespace HashWithIndifferentAccess | Akira Matsuda | 2013-01-07 | 2 | -2/+2 | |
|/ / | ||||||
* | | Merge pull request #8783 from goshakkk/refactor-journey-routes | Rafael Mendonça França | 2013-01-06 | 1 | -12/+11 | |
|\ \ | | | | | | | Refactor Journey::Routes | |||||
| * | | refactor Journey::Routes | Gosha Arinich | 2013-01-07 | 1 | -12/+11 | |
| | | | | | | | | | | | | | | | * prefer do-end for multiline blocks * prefer or-equals over returns with checks | |||||
* | | | fix for rbx | tank-bohr | 2013-01-07 | 1 | -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 requires | Akira Matsuda | 2013-01-06 | 1 | -4/+0 | |
| | | ||||||
* | | Missing requires | Akira Matsuda | 2013-01-06 | 1 | -0/+1 | |
| | | ||||||
* | | Rename route_wrapper partial layout to table | Carlos Antonio da Silva | 2013-01-06 | 2 | -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 it | Carlos Antonio da Silva | 2013-01-06 | 3 | -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 twice | Carlos Antonio da Silva | 2013-01-06 | 1 | -2/+3 | |
| | | ||||||
* | | refactor Route#ast to use or-equals and block, instead of return with a cond | Gosha Arinich | 2013-01-06 | 1 | -5/+4 | |
| | | ||||||
* | | Remove unnecessary begin..rescue..end, use only rescue | Akira Matsuda | 2013-01-06 | 1 | -5/+3 | |
| | | ||||||
* | | Merge pull request #8766 from jcoglan/session_token_docs | Andrew White | 2013-01-05 | 1 | -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 Coglan | 2013-01-05 | 1 | -7/+4 | |
| | | | ||||||
* | | | Remove warning, remove not used variable, and make methods private | Carlos Antonio da Silva | 2013-01-05 | 1 | -3/+5 | |
|/ / | | | | | | | Warning: "shadowing outer local variable - routes". | |||||
* | | Close container div tag in routing error page | Carlos Antonio da Silva | 2013-01-05 | 1 | -9/+11 | |
| | | ||||||
* | | Move style to head to make routes page valid html5 | Carlos Antonio da Silva | 2013-01-05 | 2 | -4/+6 | |
| | | ||||||
* | | display mountable engine routes on RoutingError. | Yves Senn | 2013-01-05 | 2 | -8/+23 | |
| | | ||||||
* | | split formatting concerns from RoutesInspector | Yves Senn | 2013-01-05 | 1 | -20/+42 | |
| | | ||||||
* | | Allow use of durations for ActionDispatch::SSL configuration | Andrew White | 2013-01-04 | 1 | -1/+1 | |
| | | ||||||
* | | Remove unnecessary `ERB::Util::h` | Ryunosuke SATO | 2013-01-05 | 7 | -17/+17 | |
| | | | | | | | | It is automatically applied when strings is unsafe for html. | |||||
* | | Suppress warning about IO#lines in Ruby 2.0 | Ryunosuke SATO | 2013-01-04 | 1 | -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-page | Guillermo Iguaran | 2013-01-03 | 3 | -5/+27 | |
|\ \ | | | | | | | Move error page js into script tag |