aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2860 from guilleiguaran/fix-assets-behaviorSantiago Pastorino2011-09-041-2/+2
|\
| * AssetNotPrecompiledError should be raise when config.assets.digest = false, c...Guillermo Iguaran2011-09-041-2/+2
* | * is not allowed in windows file names. Closes #2574 #2847Santiago Pastorino2011-09-042-1/+1
|/
* if ... nil? is more expensive than unlessMilan Dobrota2011-09-047-11/+11
* Merge pull request #2816 from sikachu/content_tag_forJosé Valim2011-09-043-7/+89
|\
| * Make `content_tag_for` and `div_for` accepts the array of recordsPrem Sichanugrist2011-09-043-7/+89
* | Merge pull request #2835 from guilleiguaran/actionpack-changelogSantiago Pastorino2011-09-031-2/+2
* | fix helpers behavior descriptionAlexey Vakhov2011-09-031-3/+6
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-022-7/+7
|\
| * Fix name of parent resource params when declaring nested resources at routesCarlos Paramio2011-09-011-6/+6
| * Improve examples: use each instead of for...inGabe Berke-Williams2011-08-311-1/+1
* | CookieJar is enumerable. fixes #2795Aaron Patterson2011-09-013-0/+23
* | Merge pull request #2718 from dasch/patch-5Vijay Dev2011-09-011-1/+4
|\ \
| * | Split long string into multiple shorter ones Daniel Schierbeck2011-08-291-1/+4
* | | assets:precompile should not append asset digests when config.assets.digest i...Sam Pohlenz2011-09-011-4/+5
* | | Merge pull request #2787 from guilleiguaran/changelogs-3-1-1-masterJosé Valim2011-09-011-1/+10
|\ \ \
| * | | Add missing changelog entries for 3.1.1Guillermo Iguaran2011-09-011-1/+10
* | | | Move references to Rails.application.config out of Sprockets AssetPathsSam Pohlenz2011-09-011-5/+14
|/ / /
* | / Merge pull request #2780 from guilleiguaran/assets-pipeline-minor-changesSantiago Pastorino2011-08-311-20/+13
| |/ |/|
* | 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
|\ \ \ | |/ / |/| |