Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2987 from kennyj/master | Santiago Pastorino | 2011-09-12 | 1 | -0/+3 |
|\ | | | | | fix https://github.com/rails/rails/issues/2947 (with testcase) | ||||
| * | fix https://github.com/rails/rails/issues/2947 (with testcase) | kennyj | 2011-09-13 | 1 | -0/+3 |
| | | |||||
* | | Merge pull request #2985 from kennyj/master | Santiago Pastorino | 2011-09-12 | 1 | -1/+1 |
|\| | | | | | fix https://github.com/rails/rails/issues/2582 (with testcase) | ||||
| * | fix https://github.com/rails/rails/issues/2582 (with testcase) | kennyj | 2011-09-13 | 1 | -1/+1 |
| | | |||||
* | | Fixed assets precompile regex, now accepts Procs | Alex Yakoubian | 2011-09-08 | 1 | -0/+2 |
|/ | |||||
* | Merge pull request #2889 from guilleiguaran/perform-caching-assets | Santiago Pastorino | 2011-09-06 | 1 | -1/+1 |
|\ | | | | | config.action_controller.perform_caching isn't used anymore in asset pipeline | ||||
| * | config.action_controller.perform_caching isn't used anymore in assets ↵ | Guillermo Iguaran | 2011-09-06 | 1 | -1/+1 |
| | | | | | | | | pipeline, instead we are using config.assets.digest now | ||||
* | | Merge pull request #2851 from dasch/patch-6 | Jon Leighton | 2011-09-06 | 1 | -5/+3 |
|\ \ | |/ |/| | No need to use a begin block there | ||||
| * | No need to use a begin block there | Daniel Schierbeck | 2011-09-04 | 1 | -5/+3 |
| | | |||||
* | | AssetNotPrecompiledError should be raise when config.assets.digest = false, ↵ | Guillermo Iguaran | 2011-09-04 | 1 | -2/+2 |
|/ | | | | config.assets.compile = false and manifest file isn't present | ||||
* | 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 |
| | |||||
* | 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. | ||||
* | Make Sprockets::Helpers::RailsHelper#debug_assets? more readable | Daniel Schierbeck | 2011-08-25 | 1 | -4/+4 |
| | |||||
* | 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 |
| | |||||
* | 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 |
| | | |||||
* | | 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. | ||||
* | 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! | ||||
* | Fix sprockets warnings | Joshua Peek | 2011-08-21 | 3 | -7/+20 |
| | | | | Fixes #2598 | ||||
* | Debug assets by default in development and test environments | Guillermo Iguaran | 2011-08-18 | 1 | -2/+2 |
| | |||||
* | Fix assets tests in railties | Jon Leighton | 2011-08-16 | 1 | -1/+3 |
| | |||||
* | rake assets:precompile executes in production environment as default if ↵ | Santiago Pastorino | 2011-08-15 | 1 | -4/+4 |
| | | | | RAILS_ENV was not provided | ||||
* | Ensure changing RAILS_GROUPS will load the proper dependencies. | José Valim | 2011-08-14 | 1 | -13/+16 |
| | |||||
* | Remove lame comment. | José Valim | 2011-08-09 | 1 | -1/+0 |
| | |||||
* | rake assets:precompile defaults to production env | Santiago Pastorino | 2011-08-09 | 1 | -0/+1 |
| | |||||
* | Initialize config.assets.version the same way it's done in Sprockets | Santiago Pastorino | 2011-08-08 | 1 | -1/+1 |
| | |||||
* | use assets.version in asset checksum to allow user to easily override | Ilya Grigorik | 2011-08-05 | 1 | -1/+1 |
| | |||||
* | generate environment dependent asset digests | Ilya Grigorik | 2011-08-04 | 1 | -0/+1 |
| | | | | | | If two different environments are configured to use the pipeline, but one has an extra step (such as compression) then without taking the environment into account you may end up serving wrong assets | ||||
* | Clear out tmp/cache when assets:clean is invoked. | Ilya Grigorik | 2011-08-04 | 1 | -1/+1 |
| | | | | | | Otherwise, if bad data is cached in tmp/clear then the next invocation of assets:precompile (or a regular incoming request) will pickup files from tmp without regenerating them from source. | ||||
* | Make Rails.application.assets available in initializers | Joshua Peek | 2011-07-27 | 1 | -44/+36 |
| | |||||
* | Remove unused use_sprockets config | Santiago Pastorino | 2011-07-25 | 1 | -7/+0 |
| |