aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Set default location of manifest with config.assets.manifestGuillermo Iguaran2011-08-312-2/+9
* Backport f443f9cb0c64 to masterGuillermo Iguaran2011-08-314-30/+17
* Read digests of assets from manifest.yml if config.assets.manifest is onGuillermo Iguaran2011-08-313-2/+31
* Always enable digest and compile in the Rake taskGuillermo Iguaran2011-08-311-2/+3
* Bump sprockets upSantiago Pastorino2011-08-301-1/+1
* Revert "Merge pull request #2647 from dmathieu/no_rescue"Santiago Pastorino2011-08-302-7/+7
* Document the Sprockets compressorsDaniel Schierbeck2011-08-301-7/+23
* Avoid extra recursive call in Sprockets helpersGuillermo Iguaran2011-08-281-2/+2
* Merge pull request #2723 from guilleiguaran/3-1-0-changelogsSantiago Pastorino2011-08-281-0/+2
* Bump rack-cache, rack-test, rack-mount and sprockets upSantiago Pastorino2011-08-281-4/+4
* Refactor ActionDispatch::Http::UploadedFileDaniel Schierbeck2011-08-281-14/+3
* deletes spurious arrowXavier Noria2011-08-271-1/+1
* doc fixesVijay Dev2011-08-282-12/+16
* Removed Unused Variable. Arun Agrawal2011-08-261-1/+1
* Merge pull request #2696 from guilleiguaran/string-keys-sprockets-helpersSantiago Pastorino2011-08-251-4/+4
|\
| * Removing redundant stringify_keys in Sprockets helpersGuillermo Iguaran2011-08-251-4/+4
* | Don't require a specific value for the ?debug flagDaniel Schierbeck2011-08-251-3/+1
|/
* Merge pull request #2690 from dasch/pretty-debug-assetsAaron Patterson2011-08-251-4/+4
|\
| * Make Sprockets::Helpers::RailsHelper#debug_assets? more readableDaniel Schierbeck2011-08-251-4/+4
* | Tiny refactorSantiago Pastorino2011-08-251-4/+7
* | Merge pull request #2491 from waynn/fix_symbolSantiago Pastorino2011-08-252-2/+8
|\ \ | |/ |/|
| * fix destructive stringify_keys for label_tagWaynn Lue2011-08-112-2/+8
* | stop circular require warningsAaron Patterson2011-08-241-1/+0
* | Preserve stylesheet_link_tag and javascript_include_tag options on debugGuillermo Iguaran2011-08-241-4/+3
* | Use super in javascript_include_tag and stylesheet_link_tag instead of genera...Guillermo Iguaran2011-08-241-14/+2
* | Remove redundant join and call to html_safeGuillermo Iguaran2011-08-241-2/+2
* | Revert "Simplify JavaScriptHelper#escape_javascript"Santiago Pastorino2011-08-241-4/+6
* | Bring in sprockets precompile taskJoshua Peek2011-08-241-3/+26
* | Merge pull request #2644 from guilleiguaran/allow-assets-debuggingSantiago Pastorino2011-08-242-3/+6
|\ \
| * | Add config.allow_debugging option to determine if the debug_assets query para...Guillermo Iguaran2011-08-242-3/+6
* | | Merge pull request #2668 from guilleiguaran/debug-assets-media-typeSantiago Pastorino2011-08-242-2/+6
|\ \ \ | |/ / |/| |
| * | Debug assets shouldn't ignore media type for stylesheets. Closes #2625Guillermo Iguaran2011-08-232-2/+6
* | | Merge pull request #2647 from dmathieu/no_rescueSantiago Pastorino2011-08-242-7/+8
|\ \ \
| * | | remove useless rescueDamien Mathieu2011-08-242-7/+8
* | | | Simplify JavaScriptHelper#escape_javascriptDaniel Schierbeck2011-08-241-7/+6
| |/ / |/| |
* | | Make ActionController::TestCase#recycle! set @protocol to nilDavid Majda2011-08-231-1/+1
* | | Add failing test case for #2654Andrew White2011-08-231-0/+17
* | | Ensure regexp and hash key are UTF-8Andrew White2011-08-232-4/+16
* | | Don't modify params in place - fixes #2624Andrew White2011-08-232-5/+9
|/ /
* | Merge pull request #2411 from ai/debug_assets_by_configSantiago Pastorino2011-08-222-18/+12
|\ \
| * | Allow to debug assets by config.assets.debugAndrey A.I. Sitnik2011-08-222-18/+12
* | | Fix Sprockets rewrite_asset_pathGuillermo Iguaran2011-08-221-1/+1
* | | Refactor Sprockets::Helpers::RailsHelper#performing_caching?Daniel Schierbeck2011-08-221-2/+7
* | | Merge pull request #2618 from FLOChip/unicode_jAaron Patterson2011-08-212-2/+4
|\ \ \ | |/ / |/| |
| * | fix escape_javascript for unicode character \u2028.Teng Siong Ong2011-08-212-2/+4
* | | Fix sprockets warningsJoshua Peek2011-08-213-7/+20
|/ /
* | Merge pull request #2610 from asmega/documentationXavier Noria2011-08-211-1/+1
|\ \
| * | Use typewriter styling on url_for in documentationasmega2011-08-211-1/+1
* | | Bump sprockets to 2.0.0.beta.14Guillermo Iguaran2011-08-201-1/+1
* | | Merge pull request #2596 from dharmatech/patch-1Santiago Pastorino2011-08-201-1/+1
|\ \ \