aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | Split long string into multiple shorter ones Daniel Schierbeck2011-08-291-1/+4
| | | | | | | | | This makes the code more readable.
* | | assets:precompile should not append asset digests when config.assets.digest ↵Sam Pohlenz2011-09-011-4/+5
| | | | | | | | | | | | is false
* | | Merge pull request #2787 from guilleiguaran/changelogs-3-1-1-masterJosé Valim2011-09-011-1/+10
|\ \ \ | | | | | | | | Add missing changelog entries for 3.1.1
| * | | 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
| |/ |/| | | | | Assets pipeline: fix in manifest location and remove unused code
* | 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
| | | | | | | | This reverts commit 125b1b0b9180ec8f0135da185e77250d2b8a4bea.
* | Document the Sprockets compressorsDaniel Schierbeck2011-08-301-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 helpersGuillermo Iguaran2011-08-281-2/+2
| |
* | Merge pull request #2723 from guilleiguaran/3-1-0-changelogsSantiago Pastorino2011-08-281-0/+2
| | | | | | | | Update changelogs for Rails 3.1.0
* | 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 helpers
| * 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
|/ | | | | 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-assetsAaron Patterson2011-08-251-4/+4
|\ | | | | Make Sprockets::Helpers::RailsHelper#debug_assets? more readable
| * 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_tag
| * 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 ↵Guillermo Iguaran2011-08-241-14/+2
| | | | | | | | generate tags manually
* | Remove redundant join and call to html_safeGuillermo Iguaran2011-08-241-2/+2
| |
* | Revert "Simplify JavaScriptHelper#escape_javascript"Santiago Pastorino2011-08-241-4/+6
| | | | | | | | | | | | This commit broke the build without any improvement. This reverts commit eb0b71478ad4c37fdc4ec77bf2cf7c6b65dd36c4.
* | 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
| * | Add config.allow_debugging option to determine if the debug_assets query ↵Guillermo Iguaran2011-08-242-3/+6
| | | | | | | | | | | | param can be passed by user
* | | 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 #2625
| * | 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 rescue
| * | | remove useless rescueDamien Mathieu2011-08-242-7/+8
| | | | | | | | | | | | | | | | | | | | 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_javascriptDaniel Schierbeck2011-08-241-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 nilDavid Majda2011-08-231-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>
* | | 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
|/ /