aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove unneeded requirePiotr Sarnacki2012-09-011-1/+0
|
* Merge pull request #7494 from route/actionview_decoupling_issuePiotr Sarnacki2012-09-016-18/+10
|\ | | | | ActionView decoupling and sprockets-rails tests fail
| * 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.
* Require bundler 1.2Piotr Sarnacki2012-08-311-1/+1
|
* Don't use Gemfile in test application in railtiesPiotr Sarnacki2012-08-311-5/+5
| | | | | | | | | | | | | Option to run `bundle install` after generating new appplication was added recently to rails. Since introduction, it contained a subtle bug that caused it to use `Gemfile` from current directory (if it exists) rather than from generated directory. This also accidentaly caused railties tests to work without any problems - after generating test app it just used `Gemfile` from the repository, rather than the one in generated app. After fixing the bug mentioned above, this of course broke. The easiest way to bypass that is to not generate a `Gemfile` for test application - with such setup Bundler will just use first available `Gemfile` in one of the parent directories.
* 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
| | | | | | | | The cause of the previous revert was bug in bundler that made it hard to make railties test work. Fix for bundler was recently pushed to github, so now we can safely get back to the original commit. This reverts commit 0f5cc34ab58cda99d1401ecc82e1ebb873838dd7.
* Avoid #fetch for non-nil values.Jon Leighton2012-08-311-1/+2
| | | | | | This is purely a performance optimisation. See https://gist.github.com/3552829
* Key the attributes hash with symbolsJon Leighton2012-08-314-9/+14
| | | | | | | | This is a performance/GC optimisation. In theory, this could be optimised by the implementation (last time I checked, this would have no effect on JRuby). But in practise, this make attribute access faster.
* Cache the connection pool for a given classJon Leighton2012-08-312-20/+37
|
* One hash is enoughJon Leighton2012-08-312-18/+14
| | | | We don't need separate @class_to_pool and @connection_pool hashes.
* Refactor connection handlerJon Leighton2012-08-311-22/+14
|
* Make connection pool retrieval fasterJon Leighton2012-08-313-20/+18
| | | | | | * Loop rather than recurse in retrieve_connection_pool * Key the hash by class rather than class name. This avoids creating unnecessary strings.
* 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
* | Merge pull request #7485 from kennyj/fix_build_20120830Rafael Mendonça França2012-08-301-3/+3
|\ \ | | | | | | Fix build about TemplateDigestorTest.
| * | 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 prefix
| * | 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
|\ \ | | | | | | Better ActionView::Digestor nested template inference
| * | 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
|\ \ \ | |/ / |/| | A missing require is added to fix build. When performing rake test:isolated in actionmailer, test/base_test.rb was break.
| * | Added missing require. When performing rake test:isolated, test/base_test.rb ↵kennyj2012-08-291-0/+1
| | | | | | | | | | | | was break.
* | | Merge pull request #7481 from joliss/typoVijay Dev2012-08-301-3/+3
|\ \ \ | | | | | | | | Fix grammar
| * | | 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 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
* | | fixes a regexpXavier Noria2012-08-291-1/+1
| |/ |/| | | | | | | | | | | | | We need to anchor to remove the extension. In addition to be the correct way to do that, files in ~/.rbenv get that .rb removed, so it is a real source of bugs, as reported in https://github.com/rails/rails/commit/b33700f5580b4cd85379a1dc60fa341ac4d8deb2#commitcomment-1781840
* | Merge pull request #7476 from ayrton/fixed_indentationXavier Noria2012-08-291-3/+3
|\ \ | | | | | | Fixed indendation
| * | Fixed indendationAyrton De Craene2012-08-291-3/+3
|/ /
* | Add a test to make sure preloading properly merges association and default ↵Pratik Naik2012-08-283-0/+23
| | | | | | | | scope conditions
* | CHANGELOGs are now per branchXavier Noria2012-08-286-17846/+6
| | | | | | | | | | | | | | | | | | | | 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.
* | detect circular constant autoloadingXavier Noria2012-08-284-4/+27
| | | | | | | | | | | | | | Nowadays circular autoloads do not work, but the user gets a NameError that says some constant is undefined. That's puzzling, because he is normally trying to autoload a constant he knows can be autoloaded. With this check we can give a better error message.
* | Merge pull request #7470 from kennyj/fix_method_redefined_warningRafael Mendonça França2012-08-282-0/+6
|\ \ | | | | | | Fix method redefined warnings.
| * | Fix method redefined warnings.kennyj2012-08-292-0/+6
|/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 15:50:04 +0000