aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* 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
| * 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
* | Revert "Merge pull request #7452 from arunagw/memcached_dalli"Jon Leighton2012-08-312-7/+7
* | Revert "Add missing require"Jon Leighton2012-08-311-1/+0
* | Merge pull request #7479 from eriko/masterXavier Noria2012-08-311-1/+1
|\ \
| * | Update actionpack/lib/action_dispatch/routing/mapper.rbErik Ordway2012-08-291-1/+1
* | | Instrumentation requires RackDelegationJosé Valim2012-08-301-0/+1
* | | 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 '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 co...David Heinemeier Hansson2012-08-293-4/+78
* | Add automatic template digests to all CacheHelper#cache calls (originally spi...David Heinemeier Hansson2012-08-2914-14/+358
* | 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
|\ \
| * | refactor route_set `generate_extras` functionalityschneems2012-08-281-17/+9
| * | Add Missing Keys from Journey on failed URL formatschneems2012-08-286-16/+35
* | | Fixed indendationAyrton De Craene2012-08-291-3/+3
* | | CHANGELOGs are now per branchXavier Noria2012-08-281-6069/+1
|/ /
* | removed : warning: `*' interpreted as argument prefixArun Agrawal2012-08-281-1/+1
* | Add missing requireRafael Mendonça França2012-08-281-0/+1
* | Merge pull request #7452 from arunagw/memcached_dalliRafael Mendonça França2012-08-282-7/+7
|\ \
| * | More fixes for action pack tests with Dalli.Arun Agrawal2012-08-271-3/+3
| * | Let's run action pack tests with DalliArun Agrawal2012-08-271-4/+4
* | | Update AP's CHANGELOG with user facing changesPiotr Sarnacki2012-08-281-0/+14
* | | Deprecate AV::RecordIdentifier in controllersPiotr Sarnacki2012-08-283-4/+57
* | | Fix ActionView::RecordIdentifier to work as a singletonPiotr Sarnacki2012-08-282-0/+10
* | | No need to use included hook for includePiotr Sarnacki2012-08-281-3/+1
* | | Deprecate Template#mime_typePiotr Sarnacki2012-08-282-0/+13
* | | Add deprecation horizon to html-scannerPiotr Sarnacki2012-08-281-1/+2
* | | Implement ActionView::Template::TypesPiotr Sarnacki2012-08-285-4/+65
* | | Don't require action_dispatch in ActionView::UrlHelpersPiotr Sarnacki2012-08-288-100/+134
* | | Use ActionView::Base.logger instead of AC::Base.loggerPiotr Sarnacki2012-08-282-2/+2
* | | Add ActionView::Base.default_formatsPiotr Sarnacki2012-08-284-1/+19
* | | Remove Mime::Type translations from Action ViewPiotr Sarnacki2012-08-284-11/+10
* | | Deprecate mime types lookup in auto_discovery_link_tagPiotr Sarnacki2012-08-282-1/+18
* | | Remove comment about getting rid of old AV::Base.new behaviorPiotr Sarnacki2012-08-281-2/+0
* | | Remove stubs from LogSubscriber testsPiotr Sarnacki2012-08-281-3/+4
* | | Move action_controller/vendor/html-scanner to action_viewPiotr Sarnacki2012-08-2816-27/+32