aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | Merge branch 'master' of github.com:lifo/docrailsAlmudena Garcia2012-08-231-8/+13
| |\ \
| | * | Fix rake guides:validate task as it should be run from the guides directory; ...Jaime Iniesta2012-08-231-8/+13
| * | | Fix HTML validation errorsAlmudena Garcia2012-08-234-7/+7
| |/ /
* | | require bundle in the app generatorXavier Noria2012-09-011-0/+1
* | | Remove unneeded requirePiotr Sarnacki2012-09-011-1/+0
* | | Merge pull request #7494 from route/actionview_decoupling_issuePiotr Sarnacki2012-09-016-18/+10
|\ \ \
| * | | Sprockets-rails tests failDmitry Vorotilin2012-09-016-18/+10
|/ / /
* | | Require bundler 1.2Piotr Sarnacki2012-08-311-1/+1
* | | Don't use Gemfile in test application in railtiesPiotr Sarnacki2012-08-311-5/+5
* | | Use Bundler.with_clean_env instead of custom codePiotr Sarnacki2012-08-311-6/+3
* | | Revert "Revert changes related to `bundle install` fixes in `rails new`"Piotr Sarnacki2012-08-312-3/+17
* | | Avoid #fetch for non-nil values.Jon Leighton2012-08-311-1/+2
* | | Key the attributes hash with symbolsJon Leighton2012-08-314-9/+14
* | | Cache the connection pool for a given classJon Leighton2012-08-312-20/+37
* | | One hash is enoughJon Leighton2012-08-312-18/+14
* | | Refactor connection handlerJon Leighton2012-08-311-22/+14
* | | Make connection pool retrieval fasterJon Leighton2012-08-313-20/+18
* | | 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
* | | | Merge pull request #7485 from kennyj/fix_build_20120830Rafael Mendonça França2012-08-301-3/+3
|\ \ \ \
| * | | | Fix build about TemplateDigestorTest.kennyj2012-08-301-3/+3
|/ / / /
* | | | Merge pull request #7484 from kennyj/fix_warning_20120830Rafael Mendonça França2012-08-301-1/+1
|\ \ \ \
| * | | | Fixes warning: & interpreted as argument prefixkennyj2012-08-301-1/+1
|/ / / /
* | | | Merge pull request #7483 from christos/improve_template_digestorDavid Heinemeier Hansson2012-08-304-4/+38
|\ \ \ \
| * | | | 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 #7477 from kennyj/fix_7469Piotr Sarnacki2012-08-301-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Added missing require. When performing rake test:isolated, test/base_test.rb ...kennyj2012-08-291-0/+1
* | | | | Merge pull request #7481 from joliss/typoVijay Dev2012-08-301-3/+3
|\ \ \ \ \
| * | | | | Fix grammarJo Liss2012-08-301-3/+3
* | | | | | documents after_(commit|rollback)Xavier Noria2012-08-301-0/+18
|/ / / / /
* | | | | 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
* | | | | fixes a regexpXavier Noria2012-08-291-1/+1
| |/ / / |/| | |
* | | | Merge pull request #7476 from ayrton/fixed_indentationXavier Noria2012-08-291-3/+3
|\ \ \ \
| * | | | Fixed indendationAyrton De Craene2012-08-291-3/+3
|/ / / /
* | | | Add a test to make sure preloading properly merges association and default sc...Pratik Naik2012-08-283-0/+23