Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Sprockets-rails tests fail | Dmitry Vorotilin | 2012-09-01 | 1 | -0/+3 |
| | | | | | | | 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. | ||||
* | Implement ActionView::Template::Types | Piotr Sarnacki | 2012-08-28 | 3 | -2/+61 |
| | | | | | | AV::Template::Types is a small abstraction to allow to specify template types that can be used in ActionView. When Action Pack is loaded it's replaced with Mime::Type. | ||||
* | Remove Mime::Type translations from Action View | Piotr Sarnacki | 2012-08-28 | 3 | -8/+7 |
| | | | | | Action View should not be responsible for translating mime types. Any translation that's needed should be handled at controller level. | ||||
* | Indentation should consider line number character count. | Lucas Uyezu | 2012-08-13 | 1 | -2/+2 |
| | |||||
* | Revert "Merge pull request #7033 from kron4eg/master". Not a a fan at all of ↵ | David Heinemeier Hansson | 2012-08-07 | 1 | -10/+4 |
| | | | | | | | what this makes ERB files look like. This reverts commit 46b8bceedd3e47169c50a04c93161424909c75fb, reversing changes made to 2f58795e783150f2e1b1f6c64e305703f0061129. | ||||
* | Restoring the '%' trim mode for ERb templates, allowing for a leading ↵ | Artiom Di | 2012-08-07 | 1 | -4/+10 |
| | | | | percent sign on a line to indicate non-inserted Ruby code. | ||||
* | load active_support/core_ext/class/attribute in active_support/rails | Xavier Noria | 2012-08-02 | 1 | -1/+0 |
| | |||||
* | eliminating another string subclass | Aaron Patterson | 2012-06-22 | 1 | -3/+7 |
| | |||||
* | use mutex_m rather than use a delegate system | Aaron Patterson | 2012-06-21 | 1 | -6/+3 |
| | |||||
* | Merge pull request #6428 from pinetops/resolver_concurrency_fix | Yehuda Katz | 2012-06-21 | 1 | -19/+76 |
|\ | | | | | Make the Resolver template cache threadsafe | ||||
| * | Improve the readability of the Resolver change detection code | Tom Clarke | 2012-05-22 | 1 | -11/+19 |
| | | |||||
| * | More granular locking of the Resolver template cache | Tom Clarke | 2012-05-21 | 1 | -5/+23 |
| | | | | | | | | | | | | | | In order to avoid holding a global lock when doing template resolution, instead add individual locks on a per cache entry basis. The global lock is now only used for manipulation of the main cache data structure. | ||||
| * | Make the Resolver template cache threadsafe - closes #6404 | Tom Clarke | 2012-05-21 | 1 | -19/+50 |
| | | | | | | | | | | | | | | | | | | The Template cache in the Resolver can be accessed by multiple threads similtaneously in multi-threaded environments. The cache is implemented using a Hash, which isn't threadsafe in all VMs (notably JRuby). This commit extracts the cache to a new Cache class and adds mutexes to prevent concurrent access. | ||||
* | | stop subclassing string | Aaron Patterson | 2012-06-21 | 1 | -3/+10 |
|/ | |||||
* | Revert "Merge pull request #6425 from pinetops/resolver_concurrency_fix" | José Valim | 2012-05-21 | 1 | -68/+19 |
| | | | | | This reverts commit 254c04286c5916ae7f91eb6e173b312e7a74e364, reversing changes made to 513a0525c24c2944630acfa465b22cd2f4601adf. | ||||
* | More granular locking of the Resolver template cache | Tom Clarke | 2012-05-21 | 1 | -5/+23 |
| | | | | | | | In order to avoid holding a global lock when doing template resolution, instead add individual locks on a per cache entry basis. The global lock is now only used for manipulation of the main cache data structure. | ||||
* | Make the Resolver template cache threadsafe - closes #6404 | Tom Clarke | 2012-05-21 | 1 | -19/+50 |
| | | | | | | | | | The Template cache in the Resolver can be accessed by multiple threads similtaneously in multi-threaded environments. The cache is implemented using a Hash, which isn't threadsafe in all VMs (notably JRuby). This commit extracts the cache to a new Cache class and adds mutexes to prevent concurrent access. | ||||
* | Created a Raw handler for templates. | Steve Klabnik | 2012-05-17 | 3 | -1/+16 |
| | | | | Fixes #2394 | ||||
* | Move require to where it's needed | Santiago Pastorino | 2012-05-11 | 1 | -0/+1 |
| | |||||
* | Minor clarification in documentation language and spelling | Matthew Daubert | 2012-03-13 | 1 | -4/+4 |
| | |||||
* | format lookup for partials is derived from the format in which the template ↵ | Santiago Pastorino | 2012-02-22 | 1 | -4/+0 |
| | | | | | | is being rendered Closes #5025 part 2 | ||||
* | Merge pull request #5101 from ckdake/ckdake_actionview_handler_reset | José Valim | 2012-02-20 | 1 | -0/+1 |
| | | | | | | | Reset memoized hash keys when new ActionView::Template handler is registered Conflicts: actionpack/lib/action_view/template/handlers.rb | ||||
* | updating documentation for register_template_handler | James A. Rosen | 2012-02-01 | 1 | -8/+5 |
| | |||||
* | Removed unused assigns from ActionView::Template::Error | brainopia | 2012-01-20 | 1 | -2/+2 |
| | | | | | They existed since initial rails commit by DHH but lost use a long time ago | ||||
* | Change more Array.wrap to Kernel#Array | Rafael Mendonça França | 2012-01-05 | 1 | -2/+1 |
| | |||||
* | deprecate String#encoding_aware? and remove its usage | Sergey Nartimov | 2011-12-24 | 1 | -14/+10 |
| | |||||
* | Remove some of the ActiveSupport core extensions related to 1.8. | Uģis Ozols | 2011-12-21 | 1 | -1/+0 |
| | |||||
* | Do not hard code encoding to UTF8 | José Valim | 2011-12-20 | 1 | -5/+1 |
| | |||||
* | don't encode an UTF-8 encoded template | Xu Pan | 2011-12-20 | 1 | -1/+1 |
| | |||||
* | Revert accidental change from cattr_accessor to class_attribute. | José Valim | 2011-12-08 | 1 | -1/+1 |
| | |||||
* | Some small optimizations and improvements to benchmark code. | José Valim | 2011-12-08 | 1 | -1/+1 |
| | |||||
* | fix exception page when template contains utf-8 and parameters contain utf-8 | lest | 2011-11-30 | 1 | -1/+5 |
| | |||||
* | Fixes for using action view template in isolation. | José Valim | 2011-11-30 | 2 | -2/+11 |
| | |||||
* | minor details revised in a gsub | Xavier Noria | 2011-08-18 | 1 | -1/+1 |
| | | | | | | | | | Regexps have a construct to express alternation of characters, which is character classes. In addition to being the most specific idiom to write this pattern, it reads better without the backslashes. Also, it is better not to use a capture if none is needed. As a side-effect of these changes, the gsub is marginally faster, but speed is not the point of this commit. | ||||
* | Properly escape glob characters. | Aaron Patterson | 2011-08-16 | 1 | -3/+12 |
| | |||||
* | Just remove the sort_locals method | Aaron Patterson | 2011-08-09 | 1 | -12/+1 |
| | |||||
* | the freeze trick does nothing on arrays used as hash keys. | Aaron Patterson | 2011-08-09 | 1 | -2/+1 |
| | |||||
* | use functional style to build a list of template objects | Aaron Patterson | 2011-08-09 | 1 | -9/+12 |
| | |||||
* | refactor the optimized build_query a bit | Aaron Patterson | 2011-08-08 | 1 | -8/+3 |
| | |||||
* | reduce file stats by improving our dir glob pattern | Aaron Patterson | 2011-08-08 | 1 | -1/+1 |
| | |||||
* | hash on the template directory in order to improve cache hits | Aaron Patterson | 2011-08-08 | 1 | -2/+3 |
| | |||||
* | use meaningful names with our variables | Aaron Patterson | 2011-08-08 | 1 | -6/+6 |
| | |||||
* | use binread to read the files | Aaron Patterson | 2011-08-08 | 1 | -1/+2 |
| | |||||
* | Use shorter class-level File methods instead of going through File.stat. | thedarkone | 2011-07-25 | 1 | -1/+1 |
| | |||||
* | remove warning: assigned but unused variable | Santiago Pastorino | 2011-06-08 | 1 | -1/+0 |
| | |||||
* | corrected the ActionMailer tests which broke due to some code removed from ↵ | Josh Kalderimis | 2011-05-25 | 1 | -0/+1 |
| | | | | ActionPack | ||||
* | removed deprecated methods, and related tests, from ActionPack | Josh Kalderimis | 2011-05-24 | 3 | -56/+0 |
| | |||||
* | fixed some ruby 19 warnings, including circular requires and variable name reuse | Josh Kalderimis | 2011-05-21 | 1 | -1/+0 |
| | |||||
* | Optimize the most common resolver case. | José Valim | 2011-05-09 | 1 | -13/+26 |
| | |||||
* | No need for replace. | José Valim | 2011-05-09 | 1 | -12/+11 |
| |