Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge pull request #3121 from cablegram/3-1-stable | Santiago Pastorino | 2011-09-24 | 1 | -1/+1 | |
| | | | | Re-launch assets:precompile task using (Rake.)ruby instead of Kernel.exec so it works on Windows | |||||
* | Avoid using pathnames and automatically create the manifest directory if one ↵ | José Valim | 2011-09-24 | 2 | -5/+11 | |
| | | | | does not exist yet. | |||||
* | Remove the ENV flag, yagni. | José Valim | 2011-09-24 | 1 | -3/+0 | |
| | ||||||
* | `rake assets:precompile` loads the application but does not initialize it. | José Valim | 2011-09-24 | 3 | -56/+71 | |
| | | | | | | | | | | | | | To the app developer, this means configuration add in config/initializers/* will not be executed. Plugins developers need to special case their initializers that are meant to be run in the assets group by adding :group => :assets. Conflicts: railties/CHANGELOG railties/test/application/assets_test.rb | |||||
* | Remove Sprockets compute_public_path, AV compute_public_path can be used ↵ | Guillermo Iguaran | 2011-09-23 | 1 | -5/+0 | |
| | | | | directly | |||||
* | Merge pull request #3092 from asee/master | Santiago Pastorino | 2011-09-23 | 1 | -1/+1 | |
|\ | | | | | Sprockets to use config.assets.prefix, with tests | |||||
| * | Fixes #1489 again, with updated code and numerous tests to confirm | docunext | 2011-09-22 | 1 | -1/+1 | |
| | | ||||||
* | | set env to let rails know we're precompiling | Terence Lee | 2011-09-22 | 1 | -0/+3 | |
| | | ||||||
* | | Move precompile task to Sprockets::StaticCompiler | Guillermo Iguaran | 2011-09-20 | 3 | -22/+56 | |
|/ | ||||||
* | config.action_controller.asset_host shouldn't set to nil during precompile | Guillermo Iguaran | 2011-09-15 | 1 | -3/+0 | |
| | ||||||
* | Allow asset tag helper methods to accept :digest => false option in order to ↵ | Santiago Pastorino | 2011-09-14 | 1 | -13/+15 | |
| | | | | completely avoid the digest generation. | |||||
* | Merge pull request #3015 from guilleiguaran/clear-tmp-cache-on-precompile | José Valim | 2011-09-14 | 1 | -0/+1 | |
|\ | | | | | Clear cache before of each precompile to avoid inconsistencies. Fixes #3014 | |||||
| * | Clear cache before of each precompile to avoid inconsistencies. Fixes #3014 | Guillermo Iguaran | 2011-09-13 | 1 | -0/+1 | |
| | | ||||||
* | | Revert "Provide a way to access to assets without using the digest, useful ↵ | Santiago Pastorino | 2011-09-14 | 1 | -1/+0 | |
| | | | | | | | | | | | | for static files and emails" This reverts commit 82afaa06861d03f6a2887d40e40c0ded76db88db. | |||||
* | | Don't mount Sprockets at config.assets.prefix if config.assets.compile is false. | Mark J. Titorenko | 2011-09-13 | 1 | -2/+4 | |
|/ | ||||||
* | Provide a way to access to assets without using the digest, useful for ↵ | Santiago Pastorino | 2011-09-13 | 1 | -0/+1 | |
| | | | | static files and emails | |||||
* | Fix asset_path relative_url_root method | Santiago Pastorino | 2011-09-13 | 1 | -4/+0 | |
| | ||||||
* | Fix for relative url root in assets | Guillermo Iguaran | 2011-09-13 | 1 | -4/+2 | |
| | ||||||
* | always rewrite_relative_url_root | Santiago Pastorino | 2011-09-13 | 1 | -5/+1 | |
| | ||||||
* | Merge pull request #2977 from guilleiguaran/fix-relative-root-in-assets | Santiago Pastorino | 2011-09-12 | 1 | -3/+13 | |
|\ | | | | | Set relative url root in assets when controller isn't available for Sprockets | |||||
| * | Set relative url root in assets when controller isn't available for ↵ | Guillermo Iguaran | 2011-09-13 | 1 | -3/+13 | |
| | | | | | | | | | | | | Sprockets. Fix #2435 See https://github.com/rails/sass-rails/issues/42 for details | |||||
* | | 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 |