Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #8017 from jcoglan/objectless_sessions | Jon Leighton | 2012-11-08 | 1 | -9/+23 | |
|\ \ \ | | | | | | | | | Store FlashHashes in the session as plain hashes | |||||
| * | | | Store FlashHashes in the session as plain hashes rather than custom objects ↵ | James Coglan | 2012-11-03 | 1 | -9/+23 | |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with unstable class names and instance variables. Refactor FlashHash to take values for its ivars in the constructor, to pretty up FlashHash.from_session_value. Remove stale comment on FlashHash: it is no longer Marshaled in the session so we can change its implementation. Remove blank lines I introduced in controller/test_case.rb. Unit tests for FlashHash#to_session_value. Put in a compatibility layer to accept FlashHash serializations from Rails 3.0+. Test that Rails 3.2 session flashes are correctly converted to the new format. Remove code path for processing Rails 3.0 FlashHashes since they can no longer deserialize. | |||||
* | | | Merge pull request #8115 from senny/7842_handle_trailing_slash_with_engines | Rafael Mendonça França | 2012-11-08 | 1 | -3/+1 | |
|\ \ \ | | | | | | | | | handle trailing slash with engines (test case for #7842) | |||||
| * | | | routing prefix slash replacement is no longer necessary | Yves Senn | 2012-11-04 | 1 | -3/+1 | |
| |/ / | ||||||
* / / | Add ensure block to make sure the state is properly restored | Carlos Antonio da Silva | 2012-11-04 | 1 | -1/+1 | |
|/ / | ||||||
* / | Clear url helpers when reloading routes | Santiago Pastorino | 2012-11-02 | 1 | -0/+1 | |
|/ | ||||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-11-03 | 18 | -169/+169 | |
|\ | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/mime_responds.rb activerecord/lib/active_record/attribute_methods.rb guides/source/working_with_javascript_in_rails.md | |||||
| * | 1.9 hash syntax changes to docs | AvnerCohen | 2012-10-31 | 18 | -169/+169 | |
| | | ||||||
* | | Revert "Merge pull request #7668 from Draiken/fix_issue_6497" | Rafael Mendonça França | 2012-11-02 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f4ad0ebe7a6b17658bddfeb996e3c34835b75623, reversing changes made to 8b2cbb3a832101f0e672ee309beca0f8c555b292. Conflicts: actionpack/CHANGELOG.md REASON: This added introduced a bug when you have a shorthand route inside a nested namespace. See https://github.com/rafaelfranca/rails/commit/281367eb770faf8077c1fd6194188e92ed1637a1 | |||||
* | | memoize calculated ip without additional variable | Sergey Nartimov | 2012-11-01 | 1 | -6/+4 | |
| | | | | | | | | There is no need in additional `@calculated_ip` instance variable. | |||||
* | | Fix #8086 (BestStandardsSupport rewrites app X-UA-Compatible header, now ↵ | Nikita Afanasenko | 2012-11-01 | 1 | -1/+7 | |
| | | | | | | | | | | | | | | appends). Now `BestStandardsSupport` middleware appends it's `X-UA-Compatible` value to app's value. Also test for `BestStandardsSupport` middleware added. | |||||
* | | Revert "if format is unknown NullMimeTypeObject is returned" | Guillermo Iguaran | 2012-10-31 | 1 | -12/+1 | |
| | | | | | | | | This reverts commit a8560fa361958b33d76e4468eb5c07d82a20196e. | |||||
* | | if format is unknown NullMimeTypeObject is returned | Angelo capilleri | 2012-10-31 | 1 | -1/+12 | |
| | | | | | | | | | | | | | | | | | | | | If a unknown format is passed in a request, the methods html?, xml?, json? ...etc Nil Exception. This patch add a class NullMimeTypeObject, that is returned when request.format is unknown and it responds false to the methods that ends with '?'. It refers to #7837, not fixes because it's not considered a improvement not a bug. | |||||
* | | Make caller attribute in deprecation methods optional | Alexey Gaziev | 2012-10-30 | 2 | -4/+3 | |
| | | ||||||
* | | Provide a call stack for deprecation warnings where needed. | Nikita Afanasenko | 2012-10-29 | 1 | -2/+2 | |
| | | | | | | | | It's sometimes hard to quickly find where deprecated call was performed, especially in case of migrating between Rails versions. So this is an attempt to improve the call stack part of the warning message by providing caller explicitly. | |||||
* | | Add missing require for minitest assertions. Breaks calling 'app' in console ↵ | Jeremy Kemper | 2012-10-25 | 1 | -0/+1 | |
| | | | | | | | | otherwise. See 94248ffe1e6f815b8ffab4eb752b60c1e4459d25. | |||||
* | | give access to the original exception raised in case of a parse error | Aaron Patterson | 2012-10-25 | 1 | -2/+2 | |
| | | ||||||
* | | do not lose backtrace information from the raised exception | Aaron Patterson | 2012-10-25 | 1 | -10/+6 | |
|/ | ||||||
* | synchronize on param filter cache. | Aaron Patterson | 2012-10-18 | 1 | -2/+7 | |
| | | | | Do we actually need this cache? | |||||
* | add another singleton for environment filtering | Aaron Patterson | 2012-10-18 | 1 | -3/+8 | |
| | ||||||
* | oops, forgot the default parameter | Aaron Patterson | 2012-10-18 | 1 | -1/+1 | |
| | ||||||
* | keep a singleton filter around that we can use when no filter is set | Aaron Patterson | 2012-10-18 | 1 | -2/+6 | |
| | ||||||
* | move compiled filters to their own class so that recursive calls don't | Aaron Patterson | 2012-10-18 | 1 | -41/+45 | |
| | | | | need to check for the length of @filters | |||||
* | nil isn't a valid filter | Aaron Patterson | 2012-10-18 | 1 | -1/+0 | |
| | ||||||
* | prevent people from accidentally modifying the filter word | Aaron Patterson | 2012-10-18 | 1 | -1/+1 | |
| | ||||||
* | simplify filter enabled checking | Aaron Patterson | 2012-10-18 | 1 | -9/+4 | |
| | ||||||
* | if no filters are supplied, default to an empty list | Aaron Patterson | 2012-10-18 | 1 | -1/+1 | |
| | ||||||
* | initialize required instance variables for this mixin | Aaron Patterson | 2012-10-18 | 1 | -2/+7 | |
| | ||||||
* | eagerly populate the http method loookup cache so we don't need locks | Aaron Patterson | 2012-10-18 | 1 | -1/+7 | |
| | ||||||
* | move cache inside the instance so we do not need locking | Aaron Patterson | 2012-10-18 | 1 | -9/+12 | |
| | ||||||
* | add test for fetch with a block | Aaron Patterson | 2012-10-18 | 1 | -2/+2 | |
| | ||||||
* | prefer composition over inheritence | Aaron Patterson | 2012-10-18 | 1 | -11/+15 | |
| | ||||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-10-11 | 1 | -1/+1 | |
|\ | | | | | | | | | | | Conflicts: activerecord/lib/active_record/persistence.rb railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb | |||||
| * | Space between "every" and "time" | schneems | 2012-10-02 | 1 | -1/+1 | |
| | | ||||||
* | | Revert "Use flat_map { } instead of map {}.flatten" | Santiago Pastorino | 2012-10-05 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | This reverts commit abf8de85519141496a6773310964ec03f6106f3f. We should take a deeper look to those cases flat_map doesn't do deep flattening. irb(main):002:0> [[[1,3], [1,2]]].map{|i| i}.flatten => [1, 3, 1, 2] irb(main):003:0> [[[1,3], [1,2]]].flat_map{|i| i} => [[1, 3], [1, 2]] | |||||
* | | Use flat_map { } instead of map {}.flatten | Santiago Pastorino | 2012-10-05 | 1 | -2/+2 | |
| | | ||||||
* | | config.action_dispatch.rack_cache should set explicitly to enable Rack::Cache | Guillermo Iguaran | 2012-10-04 | 1 | -6/+1 | |
| | | ||||||
* | | rename page_cache_extension option to default_static_extension | Francesco Rodriguez | 2012-10-03 | 1 | -1/+1 | |
| | | ||||||
* | | Failsafe exception returns text/plain. | Steve Klabnik | 2012-10-01 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | It's best to just return text/plain when something has gone terribly wrong. Fixes #5660. | |||||
* | | resource and resources do no longer modify passed options | Yves Senn | 2012-10-01 | 1 | -2/+2 | |
|/ | | | | this is a patch for #7777. | |||||
* | Merge pull request #7444 from szimek/params_parser_raises_parsing_error | Aaron Patterson | 2012-09-26 | 1 | -5/+12 | |
|\ | | | | | Raise generic ParseError exception when ParamsParser fails parsing request params | |||||
| * | Make ActionDispatch::ParamsParser::ParseError#original_exception return the ↵ | Szymon Nowak | 2012-08-27 | 1 | -4/+10 | |
| | | | | | | | | original exception. | |||||
| * | Fix ActionDispatch::ParamsParser::ParseError message for XML and JSON parsers. | Szymon Nowak | 2012-08-24 | 1 | -4/+2 | |
| | | ||||||
| * | Raise generic ParseError exception when ActionDispatch::ParamsParser fails ↵ | Szymon Nowak | 2012-08-24 | 1 | -2/+5 | |
| | | | | | | | | parsing request params. | |||||
* | | fixing most tests on Ruby 2.0 | Aaron Patterson | 2012-09-25 | 1 | -1/+1 | |
| | | ||||||
* | | Merge pull request #7749 from blowmage/minitest | Aaron Patterson | 2012-09-25 | 1 | -0/+3 | |
|\ \ | | | | | | | Improve support for minitest's spec DSL | |||||
| * | | Register AD::IntegrationTest for minitest's spec DSL | Mike Moore | 2012-09-24 | 1 | -0/+3 | |
| | | | ||||||
* | | | depreacte unused Mime::Type#verify_request? and ↵ | grosser | 2012-09-24 | 1 | -1/+6 | |
|/ / | | | | | | | Mime::Type.browser_generated_types | |||||
* | | documents ActionDispatch::Http::UploadedFile | Xavier Noria | 2012-09-22 | 1 | -6/+55 | |
| | | ||||||
* | | Accept parameters in methods delegated to tempfile | Sergio Gil Pérez de la Manga | 2012-09-22 | 1 | -6/+2 | |
| | |