aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* AS::Callbacks: deprecate monkey patch of object callbacksBogdan Gusiev2012-09-072-8/+8
|
* fix tests on Ruby 2.0.0Aaron Patterson2012-09-061-1/+1
|
* Define just the cattr_reader.Rafael Mendonça França2012-09-051-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 DigestorRafael Mendonça França2012-09-052-16/+22
|
* Remove unneeded requiresRafael Mendonça França2012-09-051-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/masterXavier Noria2012-09-051-1/+1
|\ | | | | Fix a typo in AD
| * Fix a typoRobin Dupret2012-09-051-1/+1
| |
* | Merge pull request #7522 from lexmag/mime_typeRafael Mendonça França2012-09-042-85/+94
|\ \ | | | | | | Refactor `Mime::Type`
| * | Refactor `Mime::Type`Aleksey Magusev2012-09-052-85/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `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 Hansson2012-09-041-1/+1
| | | | | | | | | | | | authoritative enough
* | | Make enhanced routing Concerns more tell-don't-askErnie Miller2012-09-032-37/+70
| | |
* | | Fix concerns not executing block in mapperErnie Miller2012-09-032-2/+29
| | | | | | | | | | | | Also, add documentation for alternate usage.
* | | Allow routing concerns to accept a callableErnie Miller2012-09-033-5/+34
|/ / | | | | | | | | | | 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 commentsErik Behrends2012-09-021-1/+1
| |
* | Merge pull request #7495 from steveklabnik/issue_7478Aaron Patterson2012-09-013-4/+18
|\ \ | | | | | | Properly reset the session on reset_session
| * | Force reloading of the session after destroyAndreas Loupasakis2012-09-011-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 storeAndreas Loupasakis2012-09-011-0/+8
| | |
| * | Assign a new session_id to session options hashAndreas Loupasakis2012-09-011-2/+2
| | |
| * | Properly reset the session on reset_sessionSteve Klabnik2012-08-311-2/+5
| | | | | | | | | | | | Fixes #7478
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-012-1/+5
|\ \ \
| * | | reverting changes from commit b0896c38Sven Kraeuter | 5v3n2012-09-011-1/+1
| | | |
| * | | Fix comment about Session.Steve Klabnik2012-08-311-1/+1
| | | | | | | | | | | | | | | | SessionHash isn't a thing, and tenses are wrong.
| * | | there is no "delete" action in a controllerSven Kräuter2012-08-311-1/+1
| | | |
| * | | Added example of using options_for_select() with select_tag()Kir Shatrov2012-08-301-0/+4
| | | |
* | | | Remove unneeded requirePiotr Sarnacki2012-09-011-1/+0
| | | |
* | | | Sprockets-rails tests failDmitry Vorotilin2012-09-016-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 Leighton2012-08-312-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7256cb53e0c34e510a4d59a50d120c0358cf1d99, reversing changes made to 6ebe22c3ae716d089af1e5090ddb0d12b31af8ac. Reason: A test was failing.
* | | | Revert "Add missing require"Jon Leighton2012-08-311-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e4b33b08d6d2b88b627b1e52c4f349e57c5b89fc. https://github.com/rails/rails/pull/7452#issuecomment-8094302
* | | | Merge pull request #7479 from eriko/masterXavier Noria2012-08-311-1/+1
|\ \ \ \ | |_|/ / |/| | | the example for contraint( :ip => XXXX) has an invalid regex
| * | | Update actionpack/lib/action_dispatch/routing/mapper.rbErik Ordway2012-08-291-1/+1
| | | | | | | | | | | | escape the '.'s  
* | | | Instrumentation requires RackDelegationJosé Valim2012-08-301-0/+1
| | | | | | | | | | | | Since it uses request and response methods
* | | | Fix build about TemplateDigestorTest.kennyj2012-08-301-3/+3
| | | |
* | | | Fixes warning: & interpreted as argument prefixkennyj2012-08-301-1/+1
| | | |
* | | | Further improve RENDER_DEPENDENCY regexp commentsChristos Zisopoulos2012-08-301-1/+1
| | | |
* | | | Improve RENDER_DEPENDENCY regexp comment to keep the doc editor happy.Christos Zisopoulos2012-08-301-1/+1
| | | |
* | | | `Digestor` can now parse old style hash syntax for `render`Christos Zisopoulos2012-08-303-4/+11
| | | |
* | | | `Digestor` ignores most whitespace when parsing `render` invocationsChristos Zisopoulos2012-08-304-2/+29
| | | |
* | | | Merge pull request #7480 from aaronbrethorst/masterCarlos Antonio da Silva2012-08-291-8/+8
|\ \ \ \ | | | | | | | | | | Fix markdown rendering of the ActionPack changelog [ci skip]
| * | | | Fix Markdown rendering of 'controller-level etag additions' featureAaron Brethorst2012-08-291-8/+8
| |/ / /
* / / / Use class_attribute so we dont bleedDavid Heinemeier Hansson2012-08-291-1/+6
|/ / /
* | | Added controller-level etag additions that will be part of the action etag ↵David Heinemeier Hansson2012-08-293-4/+78
| | | | | | | | | | | | computation *Jeremy Kemper/DHH*
* | | Add automatic template digests to all CacheHelper#cache calls (originally ↵David Heinemeier Hansson2012-08-2914-14/+358
| | | | | | | | | | | | spiked in the cache_digests plugin) *DHH*
* | | Fix spacingDavid Heinemeier Hansson2012-08-291-8/+8
| | |
* | | Fix spacingDavid Heinemeier Hansson2012-08-291-5/+4
| | |
* | | Merge pull request #7230 from schneems/schneems/expose_required_keysAndrew White2012-08-296-30/+41
|\ \ \ | | | | | | | | Add Missing Keys from Journey on Failed URL Format
| * | | refactor route_set `generate_extras` functionalityschneems2012-08-281-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 formatschneems2012-08-286-16/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 indendationAyrton De Craene2012-08-291-3/+3
| | | |
* | | | CHANGELOGs are now per branchXavier Noria2012-08-281-6069/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in old branches needed to be manually synched in CHANGELOGs of newer ones. This has proven to be brittle, sometimes one just forgets this manual step. With this commit we switch to CHANGELOGs per branch. When a new major version is cut from master, the CHANGELOGs in master start being blank. A link to the CHANGELOG of the previous branch allows anyone interested to follow the history.
* | | removed : warning: `*' interpreted as argument prefixArun Agrawal2012-08-281-1/+1
| | |