Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-09-02 | 2 | -7/+7 |
|\ | |||||
| * | Fix name of parent resource params when declaring nested resources at routes | Carlos Paramio | 2011-09-01 | 1 | -6/+6 |
| | | |||||
| * | Improve examples: use each instead of for...in | Gabe Berke-Williams | 2011-08-31 | 1 | -1/+1 |
| | | |||||
* | | CookieJar is enumerable. fixes #2795 | Aaron Patterson | 2011-09-01 | 3 | -0/+23 |
| | | |||||
* | | Merge pull request #2718 from dasch/patch-5 | Vijay Dev | 2011-09-01 | 1 | -1/+4 |
|\ \ | | | | | | | Split long string into multiple shorter ones | ||||
| * | | Split long string into multiple shorter ones | Daniel Schierbeck | 2011-08-29 | 1 | -1/+4 |
| | | | | | | | | | This makes the code more readable. | ||||
* | | | assets:precompile should not append asset digests when config.assets.digest ↵ | Sam Pohlenz | 2011-09-01 | 1 | -4/+5 |
| | | | | | | | | | | | | is false | ||||
* | | | Merge pull request #2787 from guilleiguaran/changelogs-3-1-1-master | José Valim | 2011-09-01 | 1 | -1/+10 |
|\ \ \ | | | | | | | | | Add missing changelog entries for 3.1.1 | ||||
| * | | | Add missing changelog entries for 3.1.1 | Guillermo Iguaran | 2011-09-01 | 1 | -1/+10 |
| | | | | |||||
* | | | | 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 | 4 | -30/+17 |
| | | |||||
* | | 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 |
| | | |||||
* | | Bump sprockets up | Santiago Pastorino | 2011-08-30 | 1 | -1/+1 |
| | | |||||
* | | Revert "Merge pull request #2647 from dmathieu/no_rescue" | Santiago Pastorino | 2011-08-30 | 2 | -7/+7 |
| | | | | | | | | 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 #2723 from guilleiguaran/3-1-0-changelogs | Santiago Pastorino | 2011-08-28 | 1 | -0/+2 |
| | | | | | | | | Update changelogs for Rails 3.1.0 | ||||
* | | Bump rack-cache, rack-test, rack-mount and sprockets up | Santiago Pastorino | 2011-08-28 | 1 | -4/+4 |
| | | |||||
* | | Refactor ActionDispatch::Http::UploadedFile | Daniel Schierbeck | 2011-08-28 | 1 | -14/+3 |
|/ | |||||
* | deletes spurious arrow | Xavier Noria | 2011-08-27 | 1 | -1/+1 |
| | |||||
* | doc fixes | Vijay Dev | 2011-08-28 | 2 | -12/+16 |
| | |||||
* | Removed Unused Variable. | Arun Agrawal | 2011-08-26 | 1 | -1/+1 |
| | |||||
* | 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. | ||||
* | Merge pull request #2690 from dasch/pretty-debug-assets | Aaron Patterson | 2011-08-25 | 1 | -4/+4 |
|\ | | | | | Make Sprockets::Helpers::RailsHelper#debug_assets? more readable | ||||
| * | Make Sprockets::Helpers::RailsHelper#debug_assets? more readable | Daniel Schierbeck | 2011-08-25 | 1 | -4/+4 |
| | | |||||
* | | Tiny refactor | Santiago Pastorino | 2011-08-25 | 1 | -4/+7 |
| | | |||||
* | | Merge pull request #2491 from waynn/fix_symbol | Santiago Pastorino | 2011-08-25 | 2 | -2/+8 |
|\ \ | |/ |/| | fix destructive stringify_keys for label_tag | ||||
| * | fix destructive stringify_keys for label_tag | Waynn Lue | 2011-08-11 | 2 | -2/+8 |
| | | |||||
* | | stop circular require warnings | Aaron Patterson | 2011-08-24 | 1 | -1/+0 |
| | | |||||
* | | 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 |
| | | |||||
* | | Revert "Simplify JavaScriptHelper#escape_javascript" | Santiago Pastorino | 2011-08-24 | 1 | -4/+6 |
| | | | | | | | | | | | | This commit broke the build without any improvement. This reverts commit eb0b71478ad4c37fdc4ec77bf2cf7c6b65dd36c4. | ||||
* | | 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 | 2 | -3/+6 |
|\ \ | | | | | | | Add config.allow_debugging option | ||||
| * | | Add config.allow_debugging option to determine if the debug_assets query ↵ | Guillermo Iguaran | 2011-08-24 | 2 | -3/+6 |
| | | | | | | | | | | | | param can be passed by user | ||||
* | | | Merge pull request #2668 from guilleiguaran/debug-assets-media-type | Santiago Pastorino | 2011-08-24 | 2 | -2/+6 |
|\ \ \ | |/ / |/| | | 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 | 2 | -2/+6 |
| | | | |||||
* | | | Merge pull request #2647 from dmathieu/no_rescue | Santiago Pastorino | 2011-08-24 | 2 | -7/+8 |
|\ \ \ | | | | | | | | | remove useless rescue | ||||
| * | | | remove useless rescue | Damien Mathieu | 2011-08-24 | 2 | -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_javascript | Daniel Schierbeck | 2011-08-24 | 1 | -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 nil | David Majda | 2011-08-23 | 1 | -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 #2654 | Andrew White | 2011-08-23 | 1 | -0/+17 |
| | | | |||||
* | | | Ensure regexp and hash key are UTF-8 | Andrew White | 2011-08-23 | 2 | -4/+16 |
| | | | |||||
* | | | Don't modify params in place - fixes #2624 | Andrew White | 2011-08-23 | 2 | -5/+9 |
|/ / |