Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7565 from guilleiguaran/dalli-session-store | Carlos Antonio da Silva | 2012-09-07 | 1 | -2/+6 |
|\ | | | | | Improve error message for memcache session store when dalli isn't loaded | ||||
| * | Improve error message for memcache session store when dalli isn't loaded in app | Guillermo Iguaran | 2012-09-07 | 1 | -2/+6 |
| | | |||||
* | | Use merge! to merge additional options onto default options | Carlos Antonio da Silva | 2012-09-07 | 1 | -4/+3 |
| | | |||||
* | | Merge pull request #7552 from guilleiguaran/dalli-session-store | Santiago Pastorino | 2012-09-07 | 1 | -3/+3 |
|\| | | | | | Use Dalli for memcache session store | ||||
| * | More fixes for action pack tests with Dalli. | Arun Agrawal | 2012-09-06 | 1 | -3/+3 |
| | | |||||
* | | AS::Callbacks: deprecate monkey patch of object callbacks | Bogdan Gusiev | 2012-09-07 | 1 | -1/+1 |
| | | |||||
* | | fix tests on Ruby 2.0.0 | Aaron Patterson | 2012-09-06 | 1 | -1/+1 |
|/ | |||||
* | Define just the cattr_reader. | Rafael Mendonça França | 2012-09-05 | 1 | -1/+2 |
| | | | | | This will trim down the API and avoid some error that can be made changing the cache object. | ||||
* | Use the same logger that ActionView::Base for the Digestor | Rafael Mendonça França | 2012-09-05 | 1 | -2/+5 |
| | |||||
* | Remove unneeded requires | Rafael Mendonça França | 2012-09-05 | 1 | -7/+3 |
| | | | | | We should not require all the core extensions inside the frameworks. The logger is already defined in the Action View framework. | ||||
* | Merge pull request #7530 from robin850/master | Xavier Noria | 2012-09-05 | 1 | -1/+1 |
|\ | | | | | Fix a typo in AD | ||||
| * | Fix a typo | Robin Dupret | 2012-09-05 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #7522 from lexmag/mime_type | Rafael Mendonça França | 2012-09-04 | 1 | -84/+93 |
|\ \ | | | | | | | Refactor `Mime::Type` | ||||
| * | | Refactor `Mime::Type` | Aleksey Magusev | 2012-09-05 | 1 | -84/+93 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `parse` method performance improvements - ~27-33%: accept = "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/x-shockwave-flash, application/vnd.ms-excel, application/vnd.ms-powerpoint, application/msword, , pronto/1.00.00, sslvpn/1.00.00.00, */*" Benchmark.measure{ 1_000_0.times { Mime::Type.parse(accept) }} old: 1.430000 0.000000 1.430000 ( 1.440977) new: 0.920000 0.000000 0.920000 ( 0.921813) | ||||
* | | | We dont need to include the name and the format in the digest -- source is ↵ | David Heinemeier Hansson | 2012-09-04 | 1 | -1/+1 |
| | | | | | | | | | | | | authoritative enough | ||||
* | | | Make enhanced routing Concerns more tell-don't-ask | Ernie Miller | 2012-09-03 | 1 | -25/+55 |
| | | | |||||
* | | | Fix concerns not executing block in mapper | Ernie Miller | 2012-09-03 | 1 | -2/+19 |
| | | | | | | | | | | | | Also, add documentation for alternate usage. | ||||
* | | | Allow routing concerns to accept a callable | Ernie Miller | 2012-09-03 | 1 | -3/+7 |
|/ / | | | | | | | | | | | This allows us to make alterations to the generated routes based on the scope of the current mapper, and otherwise allows us to move larger blocks of concerns out of the routes file, altogether. | ||||
* | | Fix example code: use tasks instead of comments | Erik Behrends | 2012-09-02 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #7495 from steveklabnik/issue_7478 | Aaron Patterson | 2012-09-01 | 3 | -4/+18 |
|\ \ | | | | | | | Properly reset the session on reset_session | ||||
| * | | Force reloading of the session after destroy | Andreas Loupasakis | 2012-09-01 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | Use load_for_write! to ensure a refresh of the session object. This way the new session_id and the empty data will be stored properly. E.g. in the case of the session cookie store this means that a new digest will be returned to the user. | ||||
| * | | Override rack's destroy_session in cookie store | Andreas Loupasakis | 2012-09-01 | 1 | -0/+8 |
| | | | |||||
| * | | Assign a new session_id to session options hash | Andreas Loupasakis | 2012-09-01 | 1 | -2/+2 |
| | | | |||||
| * | | Properly reset the session on reset_session | Steve Klabnik | 2012-08-31 | 1 | -2/+5 |
| | | | | | | | | | | | | Fixes #7478 | ||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-09-01 | 2 | -1/+5 |
|\ \ \ | |||||
| * | | | reverting changes from commit b0896c38 | Sven Kraeuter | 5v3n | 2012-09-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix comment about Session. | Steve Klabnik | 2012-08-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | SessionHash isn't a thing, and tenses are wrong. | ||||
| * | | | there is no "delete" action in a controller | Sven Kräuter | 2012-08-31 | 1 | -1/+1 |
| | | | | |||||
| * | | | Added example of using options_for_select() with select_tag() | Kir Shatrov | 2012-08-30 | 1 | -0/+4 |
| | | | | |||||
* | | | | Remove unneeded require | Piotr Sarnacki | 2012-09-01 | 1 | -1/+0 |
| | | | | |||||
* | | | | Sprockets-rails tests fail | Dmitry Vorotilin | 2012-09-01 | 6 | -18/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Method invalid_asset_host! was delegated to controller but sprockets compile assets in their own scope without controller. And if we set asset_host with second parameter it should raise error through invalid_asset_host!. But since controller is nil it cannot be reached. | ||||
* | | | | Revert "Merge pull request #7452 from arunagw/memcached_dalli" | Jon Leighton | 2012-08-31 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7256cb53e0c34e510a4d59a50d120c0358cf1d99, reversing changes made to 6ebe22c3ae716d089af1e5090ddb0d12b31af8ac. Reason: A test was failing. | ||||
* | | | | Merge pull request #7479 from eriko/master | Xavier Noria | 2012-08-31 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | the example for contraint( :ip => XXXX) has an invalid regex | ||||
| * | | | Update actionpack/lib/action_dispatch/routing/mapper.rb | Erik Ordway | 2012-08-29 | 1 | -1/+1 |
| | | | | | | | | | | | | escape the '.'s | ||||
* | | | | Instrumentation requires RackDelegation | José Valim | 2012-08-30 | 1 | -0/+1 |
| | | | | | | | | | | | | Since it uses request and response methods | ||||
* | | | | Fixes warning: & interpreted as argument prefix | kennyj | 2012-08-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | Further improve RENDER_DEPENDENCY regexp comments | Christos Zisopoulos | 2012-08-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | Improve RENDER_DEPENDENCY regexp comment to keep the doc editor happy. | Christos Zisopoulos | 2012-08-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | `Digestor` can now parse old style hash syntax for `render` | Christos Zisopoulos | 2012-08-30 | 1 | -4/+4 |
| | | | | |||||
* | | | | `Digestor` ignores most whitespace when parsing `render` invocations | Christos Zisopoulos | 2012-08-30 | 1 | -2/+2 |
| | | | | |||||
* | | | | Use class_attribute so we dont bleed | David Heinemeier Hansson | 2012-08-29 | 1 | -1/+6 |
|/ / / | |||||
* | | | Added controller-level etag additions that will be part of the action etag ↵ | David Heinemeier Hansson | 2012-08-29 | 1 | -4/+34 |
| | | | | | | | | | | | | computation *Jeremy Kemper/DHH* | ||||
* | | | Add automatic template digests to all CacheHelper#cache calls (originally ↵ | David Heinemeier Hansson | 2012-08-29 | 3 | -9/+198 |
| | | | | | | | | | | | | spiked in the cache_digests plugin) *DHH* | ||||
* | | | Fix spacing | David Heinemeier Hansson | 2012-08-29 | 1 | -8/+8 |
| | | | |||||
* | | | Fix spacing | David Heinemeier Hansson | 2012-08-29 | 1 | -5/+4 |
| | | | |||||
* | | | Merge pull request #7230 from schneems/schneems/expose_required_keys | Andrew White | 2012-08-29 | 2 | -18/+13 |
|\ \ \ | | | | | | | | | Add Missing Keys from Journey on Failed URL Format | ||||
| * | | | refactor route_set `generate_extras` functionality | schneems | 2012-08-28 | 1 | -17/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | The result of Generator with or without the @extras instance variable set contains the desired information. Rather than preserving state when initializing the original object, we can simply extract the keys from the resultant parameters. ATP Actionpack, railties | ||||
| * | | | Add Missing Keys from Journey on failed URL format | schneems | 2012-08-28 | 2 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many named routes have keys that are required to successfully resolve. If a key is left off like this: <%= link_to 'user', user_path %> This will produce an error like this: No route matches {:action=>"show", :controller=>"users"} Since we know that the :id is missing, we can add extra debugging information to the error message. No route matches {:action=>"show", :controller=>"users"} missing required keys: [:id] This will help new and seasoned developers look closer at their parameters. I've also subclassed the routing error to be clear that this error is a result of attempting to generate a url and not because the user is trying to visit a bad url. While this may sound trivial this error message is misleading and confuses most developers. The important part isn't what's in the options its's what's missing. Adding this information to the error message will make debugging much more obvious. This is the sister pull request of https://github.com/rails/journey/pull/44 which will be required to get they missing keys into the correct error message. Example Development Error in Rails: http://cl.ly/image/3S0T0n1T3421 | ||||
* | | | | Fixed indendation | Ayrton De Craene | 2012-08-29 | 1 | -3/+3 |
|/ / / | |||||
* | | | removed : warning: `*' interpreted as argument prefix | Arun Agrawal | 2012-08-28 | 1 | -1/+1 |
| | | |