aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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
|/ /
* | Merge pull request #7469 from kennyj/fix_many_warnings_in_amJosé Valim2012-08-281-1/+1
|\ \ | | | | | | Fixes warnings when executing rake test in ActionMailer.
| * | Fixes warnings when executing rake test in ActionMailer. Related to ↵kennyj2012-08-291-1/+1
|/ / | | | | | | 582a7f459990487659886b90e54c22e055c65870
* | Merge pull request #7468 from kennyj/tiny_fixingsJosé Valim2012-08-285-7/+4
|\ \ | |/ |/| Tiny fixes in railties/test/application.
| * Remove unused require.kennyj2012-08-292-3/+0
| |
| * Fixes wrong test class names.kennyj2012-08-294-4/+4
|/
* fixes a bug in dependencies.rbXavier Noria2012-08-281-1/+1
| | | | | | | loaded stores file names without the .rb extension, but search_for_file returns file names with the extension. The solution is hackish, but this file needs a revamp.
* Merge pull request #7466 from arunagw/warning_removed_apRafael Mendonça França2012-08-281-1/+1
|\ | | | | removed : warning: `*' interpreted as argument prefix
| * 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
|\ | | | | Memcached to dalli for actionpack test.
| * 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
| | | | | | There is no memcache gem left in repo.
* | Merge pull request #7465 from wpp/generator_controller_pluralJosé Valim2012-08-281-6/+6
|\ \ | | | | | | Change generators controller help from singular to plural example.
| * | Change generators controller help from singular to plural example.Philipp Weissensteiner2012-08-281-6/+6
|/ / | | | | | | | | | | | | When running `rails generate controller --help` an example with creating a (singular) "CreditCard" controller is shown. The convention is to generate controllers with plural names though.
* | Merge pull request #7458 from frodsan/fix_orddep_basicsRafael Mendonça França2012-08-281-5/+5
|\ \ | | | | | | fix order dependent test in AR::BasicsTest
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-18 22:22:20 +0000