Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | assets:precompile should not append asset digests when config.assets.digest ↵ | Sam Pohlenz | 2011-09-01 | 1 | -4/+5 |
| | | | | is false | ||||
* | Move references to Rails.application.config out of Sprockets AssetPaths | Sam Pohlenz | 2011-09-01 | 1 | -5/+14 |
| | |||||
* | Merge pull request #2780 from guilleiguaran/assets-pipeline-minor-changes | Santiago Pastorino | 2011-08-31 | 1 | -20/+13 |
| | | | | Assets pipeline: fix in manifest location and remove unused code | ||||
* | Set default location of manifest with config.assets.manifest | Guillermo Iguaran | 2011-08-31 | 2 | -2/+9 |
| | |||||
* | Backport f443f9cb0c64 to master | Guillermo Iguaran | 2011-08-31 | 3 | -28/+13 |
| | |||||
* | Read digests of assets from manifest.yml if config.assets.manifest is on | Guillermo Iguaran | 2011-08-31 | 3 | -2/+31 |
| | |||||
* | Always enable digest and compile in the Rake task | Guillermo Iguaran | 2011-08-31 | 1 | -2/+3 |
| | |||||
* | Revert "Merge pull request #2647 from dmathieu/no_rescue" | Santiago Pastorino | 2011-08-30 | 1 | -2/+6 |
| | | | | This reverts commit 125b1b0b9180ec8f0135da185e77250d2b8a4bea. | ||||
* | Document the Sprockets compressors | Daniel Schierbeck | 2011-08-30 | 1 | -7/+23 |
| | | | | | | Add documentation to Sprockets::NullCompressor and Sprockets::LazyCompressor. Also, make LazyCompressor#compressor private, as it isn't part of the public API. | ||||
* | Avoid extra recursive call in Sprockets helpers | Guillermo Iguaran | 2011-08-28 | 1 | -2/+2 |
| | |||||
* | Refactor ActionDispatch::Http::UploadedFile | Daniel Schierbeck | 2011-08-28 | 1 | -14/+3 |
| | |||||
* | deletes spurious arrow | Xavier Noria | 2011-08-27 | 1 | -1/+1 |
| | |||||
* | doc fixes | Vijay Dev | 2011-08-28 | 2 | -12/+16 |
| | |||||
* | Merge pull request #2696 from guilleiguaran/string-keys-sprockets-helpers | Santiago Pastorino | 2011-08-25 | 1 | -4/+4 |
|\ | | | | | Removing redundant stringify_keys in Sprockets helpers | ||||
| * | Removing redundant stringify_keys in Sprockets helpers | Guillermo Iguaran | 2011-08-25 | 1 | -4/+4 |
| | | |||||
* | | Don't require a specific value for the ?debug flag | Daniel Schierbeck | 2011-08-25 | 1 | -3/+1 |
|/ | | | | | Previously, only "1" and "true" were accepted. This change makes any value, or no value at all, have the same effect. | ||||
* | Merge pull request #2690 from dasch/pretty-debug-assets | Aaron Patterson | 2011-08-25 | 1 | -4/+4 |
|\ | | | | | Make Sprockets::Helpers::RailsHelper#debug_assets? more readable | ||||
| * | Make Sprockets::Helpers::RailsHelper#debug_assets? more readable | Daniel Schierbeck | 2011-08-25 | 1 | -4/+4 |
| | | |||||
* | | Tiny refactor | Santiago Pastorino | 2011-08-25 | 1 | -4/+7 |
| | | |||||
* | | Merge pull request #2491 from waynn/fix_symbol | Santiago Pastorino | 2011-08-25 | 1 | -2/+2 |
|\ \ | |/ |/| | fix destructive stringify_keys for label_tag | ||||
| * | fix destructive stringify_keys for label_tag | Waynn Lue | 2011-08-11 | 1 | -2/+2 |
| | | |||||
* | | stop circular require warnings | Aaron Patterson | 2011-08-24 | 1 | -1/+0 |
| | | |||||
* | | Preserve stylesheet_link_tag and javascript_include_tag options on debug | Guillermo Iguaran | 2011-08-24 | 1 | -4/+3 |
| | | |||||
* | | Use super in javascript_include_tag and stylesheet_link_tag instead of ↵ | Guillermo Iguaran | 2011-08-24 | 1 | -14/+2 |
| | | | | | | | | generate tags manually | ||||
* | | Remove redundant join and call to html_safe | Guillermo Iguaran | 2011-08-24 | 1 | -2/+2 |
| | | |||||
* | | Revert "Simplify JavaScriptHelper#escape_javascript" | Santiago Pastorino | 2011-08-24 | 1 | -4/+6 |
| | | | | | | | | | | | | This commit broke the build without any improvement. This reverts commit eb0b71478ad4c37fdc4ec77bf2cf7c6b65dd36c4. | ||||
* | | Bring in sprockets precompile task | Joshua Peek | 2011-08-24 | 1 | -3/+26 |
| | | |||||
* | | Merge pull request #2644 from guilleiguaran/allow-assets-debugging | Santiago Pastorino | 2011-08-24 | 1 | -3/+4 |
|\ \ | | | | | | | Add config.allow_debugging option | ||||
| * | | Add config.allow_debugging option to determine if the debug_assets query ↵ | Guillermo Iguaran | 2011-08-24 | 1 | -3/+4 |
| | | | | | | | | | | | | param can be passed by user | ||||
* | | | Merge pull request #2668 from guilleiguaran/debug-assets-media-type | Santiago Pastorino | 2011-08-24 | 1 | -2/+3 |
|\ \ \ | |/ / |/| | | Debug assets shouldn't ignore media type for stylesheets. Closes #2625 | ||||
| * | | Debug assets shouldn't ignore media type for stylesheets. Closes #2625 | Guillermo Iguaran | 2011-08-23 | 1 | -2/+3 |
| | | | |||||
* | | | Merge pull request #2647 from dmathieu/no_rescue | Santiago Pastorino | 2011-08-24 | 1 | -6/+3 |
|\ \ \ | | | | | | | | | remove useless rescue | ||||
| * | | | remove useless rescue | Damien Mathieu | 2011-08-24 | 1 | -6/+3 |
| | | | | | | | | | | | | | | | | | | | | params is a method, defined in every controller, which always returns a hash. If it raises a NoMethodError, it means there's a bug somewhere else, which we want to know about. | ||||
* | | | | Simplify JavaScriptHelper#escape_javascript | Daniel Schierbeck | 2011-08-24 | 1 | -7/+6 |
| |/ / |/| | | | | | | | | | | | | | | Use the Linus-style conditional. Also fix the documentation slightly. Signed-off-by: Andrew White <andyw@pixeltrix.co.uk> | ||||
* | | | Make ActionController::TestCase#recycle! set @protocol to nil | David Majda | 2011-08-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that the protocol does not get carried over when there are two or more requests in functional tests. This was a problem when e.g. the first request was HTTP and the second request was HTTPS. Closes #2654. Signed-off-by: Andrew White <andyw@pixeltrix.co.uk> | ||||
* | | | Ensure regexp and hash key are UTF-8 | Andrew White | 2011-08-23 | 1 | -3/+10 |
| | | | |||||
* | | | Don't modify params in place - fixes #2624 | Andrew White | 2011-08-23 | 1 | -5/+3 |
|/ / | |||||
* | | Merge pull request #2411 from ai/debug_assets_by_config | Santiago Pastorino | 2011-08-22 | 1 | -4/+6 |
|\ \ | | | | | | | Debug assets by config | ||||
| * | | Allow to debug assets by config.assets.debug | Andrey A.I. Sitnik | 2011-08-22 | 1 | -4/+6 |
| | | | |||||
* | | | Fix Sprockets rewrite_asset_path | Guillermo Iguaran | 2011-08-22 | 1 | -1/+1 |
| | | | |||||
* | | | Refactor Sprockets::Helpers::RailsHelper#performing_caching? | Daniel Schierbeck | 2011-08-22 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | No need for them lines to get so long! Also, move that comment into the method body where it belongs! | ||||
* | | | Merge pull request #2618 from FLOChip/unicode_j | Aaron Patterson | 2011-08-21 | 1 | -2/+3 |
|\ \ \ | |/ / |/| | | fix escape_javascript for unicode character \u2028. | ||||
| * | | fix escape_javascript for unicode character \u2028. | Teng Siong Ong | 2011-08-21 | 1 | -2/+3 |
| | | | |||||
* | | | Fix sprockets warnings | Joshua Peek | 2011-08-21 | 3 | -7/+20 |
|/ / | | | | | | | Fixes #2598 | ||||
* | | Merge pull request #2610 from asmega/documentation | Xavier Noria | 2011-08-21 | 1 | -1/+1 |
|\ \ | | | | | | | added link to url_for in documentation | ||||
| * | | Use typewriter styling on url_for in documentation | asmega | 2011-08-21 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #2596 from dharmatech/patch-1 | Santiago Pastorino | 2011-08-20 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | ActionController::Redirecting : fix docs typo | ||||
| * | | | ActionController::Redirecting : fix docs typo | dharmatech | 2011-08-20 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #2597 from dharmatech/patch-2 | Santiago Pastorino | 2011-08-20 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | actionpack/lib/action_controller/base.rb: docs typo | ||||
| * | | | actionpack/lib/action_controller/base.rb: docs typo | dharmatech | 2011-08-20 | 1 | -1/+1 |
| |/ / |