Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Restore original remote_ip algorithm. | Andre Arko | 2013-01-02 | 1 | -53/+112 | |
|/ / | | | | | | | | | | | | | | | | | | | | | Proxy servers add X-Forwarded-For headers, resulting in a list of IPs. We remove trusted IP values, and then take the last given value, assuming that it is the most likely to be the correct, unfaked value. See [1] for a very thorough discussion of why that is the best option we have at the moment. [1]: http://blog.gingerlime.com/2012/rails-ip-spoofing-vulnerabilities-and-protection/ Fixes #7979 | |||||
* | | Merge pull request #8697 from goshakkk/undup | Rafael Mendonça França | 2013-01-02 | 1 | -5/+3 | |
|\ \ | | | | | | | Remove another unnecessary dup | |||||
| * | | remove another unnecessary dup | Gosha Arinich | 2013-01-02 | 1 | -5/+3 | |
| | | | ||||||
* | | | Merge pull request #8701 from senny/8700_double_slash_with_trailing_slash | Rafael Mendonça França | 2013-01-02 | 1 | -1/+5 | |
|\ \ \ | | | | | | | | | do not append a second slash when using `trailing_slash: true` | |||||
| * | | | do not append a second slash when using | Yves Senn | 2013-01-02 | 1 | -1/+5 | |
| |/ / | ||||||
* | | | Fixing closing </p> | Guillermo Iguaran | 2013-01-02 | 1 | -1/+1 | |
| | | | ||||||
* | | | Fix a number of validation/style errors: | Sam Ruby | 2013-01-02 | 2 | -8/+7 | |
|/ / | | | | | | | | | | | | | | | | | | | * <pre> is not allowed to be nested inside of <p> elements in HTML * Indentation of </p> doesn't match corresponding <p> * <p> element not explicitly closed * One more </div> than <div> In each case, the template was fixed to match how a HTML5 parser would "see" the resulting page. | |||||
* | | Merge pull request #8694 from goshakkk/undup | Carlos Antonio da Silva | 2013-01-02 | 1 | -2/+1 | |
|\ \ | | | | | | | Remove unnecessary #dup | |||||
| * | | remove unnecessary #dup | Gosha Arinich | 2013-01-02 | 1 | -2/+1 | |
| | | | ||||||
* | | | Merge pull request #8688 from goshakkk/error-page-toggle | Guillermo Iguaran | 2013-01-02 | 1 | -3/+3 | |
|\ \ \ | |/ / |/| | | Allow toggling dumps on error page | |||||
| * | | allow toggling dumps instead of just showing | Gosha Arinich | 2013-01-02 | 1 | -3/+3 | |
| | | | ||||||
* | | | Cleanup some unnecessary CSS on the new error page and reformat some lines. | Lucas Mazza | 2013-01-02 | 1 | -12/+13 | |
| | | | ||||||
* | | | add source line padding | Gosha Arinich | 2013-01-02 | 1 | -0/+4 | |
|/ / | ||||||
* | | remove meaningless AS::FrozenObjectError | Akira Matsuda | 2013-01-02 | 1 | -1/+0 | |
| | | ||||||
* | | Fix indent in UnknownAction template | Guillermo Iguaran | 2013-01-01 | 1 | -1/+1 | |
|/ | ||||||
* | Summary and Details HTML elements aren't supported in all modern browsers | Guillermo Iguaran | 2012-12-31 | 2 | -12/+12 | |
| | ||||||
* | Add style to AV::Template::Error exception page | Guillermo Iguaran | 2012-12-31 | 2 | -14/+42 | |
| | ||||||
* | Improve line-height to have better line spacing in exception message | Guillermo Iguaran | 2012-12-31 | 1 | -0/+1 | |
| | ||||||
* | Add new style to Routing Error page | Guillermo Iguaran | 2012-12-31 | 1 | -19/+22 | |
| | ||||||
* | Styling for exception page | Guillermo Iguaran | 2012-12-31 | 6 | -29/+150 | |
| | ||||||
* | Add source extract to detailed exception page | Guillermo Iguaran | 2012-12-31 | 4 | -2/+34 | |
| | ||||||
* | Merge pull request #8666 from mekishizufu/fix_lambdas | Santiago Pastorino | 2012-12-31 | 1 | -2/+2 | |
|\ | | | | | Fix usage of lambda as a Rack endpoint | |||||
| * | Fix usage of lambda as a Rack endpoint | Jiri Pospisil | 2012-12-31 | 1 | -2/+2 | |
| | | | | | | | | The response body needs to respond_to? :each. | |||||
* | | Alias refute methods to assert_not and perfer assert_not on tests | Rafael Mendonça França | 2012-12-31 | 1 | -1/+1 | |
| | | ||||||
* | | Inherit from MiniTest::Unit::TestCase instead of MiniTest::Spec | Rafael Mendonça França | 2012-12-31 | 1 | -3/+0 | |
|/ | ||||||
* | Merge pull request #8662 from ↵ | Santiago Pastorino | 2012-12-31 | 1 | -2/+6 | |
|\ | | | | | | | | | senny/8661_should_not_append_charset_if_already_present Charset should not be appended to image/* type | |||||
| * | charset should not be appended for `head` responses | Yves Senn | 2012-12-31 | 1 | -2/+6 | |
| | | | | | | | | | | | | | | 1) Failure: test_head_created_with_image_png_content_type(RenderTest) [test/controller/render_test.rb:1238]: Expected: "image/png" Actual: "image/png; charset=utf-8" | |||||
* | | Define [], []=, permanent, signed and encrypted as the only allowed methods ↵ | Santiago Pastorino | 2012-12-30 | 1 | -9/+57 | |
|/ | | | | for the non Raw Cookie classes | |||||
* | Merge pull request #8627 from schneems/schneems/routes-1-9 | Rafael Mendonça França | 2012-12-26 | 1 | -1/+1 | |
|\ | | | | | Ruby 1.9 style hash in Route Inspector | |||||
| * | Ruby 1.9 style hash in Route Inspector | schneems | 2012-12-27 | 1 | -1/+1 | |
| | | ||||||
* | | We need to check explictly that env['action_dispatch.show_exceptions'] | Rafael Mendonça França | 2012-12-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | is false. If it is nil we can't raise the exception | |||||
* | | more descriptive return parameters | Hrvoje Šimić | 2012-12-26 | 1 | -4/+3 | |
| | | ||||||
* | | return Mime::NullType if format is unknown | Angelo Capilleri | 2012-12-22 | 1 | -1/+12 | |
| | | | | | | | | | | | | | | | | | | | | If a request has an unknown format, the methods html?, xml?, json? ...etc not raise an Exception. This patch add a class Mime::NullType, that is returned when request.format is unknown and it responds false to the methods that ends with '?' and true to 'nil?'. It refers to #7837, this issue is considered a improvement not a bug. | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-12-21 | 1 | -0/+5 | |
|\ \ | ||||||
| * | | Add script_name option description and example for #url_for options | Ivan Vanyak | 2012-12-17 | 1 | -0/+5 | |
| | | | ||||||
* | | | Fix indentation issuing warning | Carlos Antonio da Silva | 2012-12-20 | 1 | -1/+1 | |
| | | | ||||||
* | | | update AD::Journey to follow Rails coding conventions | Francesco Rodriguez | 2012-12-20 | 16 | -437/+439 | |
| | | | ||||||
* | | | :nodoc: Journey because is not part of the public API [ci skip] | Francesco Rodriguez | 2012-12-19 | 20 | -78/+75 | |
| | | | ||||||
* | | | remove code for Ruby 1.8.x support | Francesco Rodriguez | 2012-12-19 | 1 | -7/+2 | |
| | | | ||||||
* | | | Remove the actual extension file as well [ci skip] | Andrew White | 2012-12-19 | 1 | -11/+0 | |
| | | | ||||||
* | | | Remove obsolete Hash extension needed for Ruby 1.8.x support | Andrew White | 2012-12-19 | 1 | -1/+0 | |
| | | | | | | | | | | | | [ci skip] | |||||
* | | | Integrate Journey into Action Dispatch | Andrew White | 2012-12-19 | 27 | -1/+2339 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Move the Journey code underneath the ActionDispatch namespace so that we don't pollute the global namespace with names that may be used for models. Fixes rails/journey#49. | |||||
* | | | Minor js review [ci skip] | Carlos Antonio da Silva | 2012-12-18 | 1 | -7/+7 | |
| | | | | | | | | | | | | Remove/add ; where necessary, fix indentation. | |||||
* | | | Format routes as html on debug page | schneems | 2012-12-17 | 4 | -2/+76 | |
| |/ |/| | | | | | | | | | | | | | | | When someone gets a routing exception, the routes are rendered (starting in Rails 4.0). This PR brings parity between the html routes in the `rails/info/routes` path and when rendered from an exception. This is the continuation of #8521 which brought html formatted routes. In addition to bringing parity to the two views, we're keeping our views DRY by rendering off of the same partials. In this case Railties depends on partials provided by ActionDispatch. I'm open to alternative implementations. Ideally both views will use the same code so any improvements or updates to it will be reproduced on both. <hr /> ![](http://f.cl.ly/items/3O1D0K1v0j0i343O3T3T/Screen%20Shot%202012-12-17%20at%203.07.20%20PM.png) | |||||
* | | Merge pull request #8529 from schneems/schneems/debug-exceptions-extend-path | Steve Klabnik | 2012-12-16 | 1 | -1/+1 | |
|\ \ | |/ |/| | DebugExceptions `File.join` => `File.expand_path` | |||||
| * | DebugExceptions `File.join` => `File.expand_path` | schneems | 2012-12-16 | 1 | -1/+1 | |
| | | ||||||
* | | Revert "Merge pull request #8499 from schneems/schneems/html-route-inspector" | Steve Klabnik | 2012-12-14 | 1 | -24/+7 | |
| | | | | | | | | | | | | | | This reverts commit ae68fc3864e99ab43c18fd12577744e1583f6b64, reversing changes made to 0262a18c7b0ab6f60fee842b3007388f9ffeb0fa. See here: https://github.com/rails/rails/pull/8499#issuecomment-11356417 | |||||
* | | remove a cache we do not need | Aaron Patterson | 2012-12-14 | 1 | -5/+1 | |
| | | ||||||
* | | Merge pull request #8510 from thedarkone/thread_safety_improvements | Aaron Patterson | 2012-12-14 | 2 | -15/+7 | |
|\ \ | | | | | | | Thread safety improvements | |||||
| * | | Replace some global Hash usages with the new thread safe cache. | thedarkone | 2012-12-14 | 2 | -15/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Summary of the changes: * Add thread_safe gem. * Use thread safe cache for digestor caching. * Replace manual synchronization with ThreadSafe::Cache in Relation::Delegation. * Replace @attribute_method_matchers_cache Hash with ThreadSafe::Cache. * Use TS::Cache to avoid the synchronisation overhead on listener retrieval. * Replace synchronisation with TS::Cache usage. * Use a preallocated array for performance/memory reasons. * Update the controllers cache to the new AS::Dependencies::ClassCache API. The original @controllers cache no longer makes much sense after @tenderlove's changes in 7b6bfe84f3 and f345e2380c. * Use TS::Cache in the connection pool to avoid locking overhead. * Use TS::Cache in ConnectionHandler. |