Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Add missing changelog entries for actionpack | Guillermo Iguaran | 2011-09-13 | 1 | -0/+4 | |
| | | | ||||||
* | | | 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. | |||||
* | | | Merge pull request #2964 from msgehard/silence_warnings | Santiago Pastorino | 2011-09-14 | 1 | -9/+2 | |
|\ \ \ | |/ / |/| | | Silence Ruby warnings about uninitialized instance variable. | |||||
| * | | Silence Ruby warnings about uninitialized instance variable. | Mike Gehard | 2011-09-09 | 1 | -9/+2 | |
| | | | ||||||
* | | | 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 | 2 | -7/+5 | |
| | | ||||||
* | | 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 | 2 | -6/+2 | |
| | | ||||||
* | | Merge pull request #2977 from guilleiguaran/fix-relative-root-in-assets | Santiago Pastorino | 2011-09-12 | 3 | -3/+22 | |
|\ \ | | | | | | | 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 | 3 | -3/+22 | |
| | | | | | | | | | | | | | | | | | | 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 | |
| | | | | ||||||
* | | | | removing backwards compatibility module | Aaron Patterson | 2011-09-12 | 3 | -9/+8 | |
| | | | | ||||||
* | | | | partially expand the parameters to `match` | Aaron Patterson | 2011-09-12 | 1 | -3/+3 | |
| | | | | ||||||
* | | | | unfactor the Route class to private factory methods | Aaron Patterson | 2011-09-12 | 2 | -45/+42 | |
| | | | | ||||||
* | | | | reduce dependencies of external objects in the Route class | Aaron Patterson | 2011-09-12 | 2 | -16/+18 | |
| | | | | ||||||
* | | | | delete unused code, pass path explicitly to journey | Aaron Patterson | 2011-09-12 | 2 | -28/+7 | |
| | | | | ||||||
* | | | | all routes can be stored in the Journey Routes object | Aaron Patterson | 2011-09-12 | 3 | -6/+6 | |
| | | | | ||||||
* | | | | clear! does not need to be called from initialize | Aaron Patterson | 2011-09-12 | 1 | -4/+3 | |
| | | | | ||||||
* | | | | reuse the route collection and formatter by clearing them | Aaron Patterson | 2011-09-12 | 1 | -6/+10 | |
| | | | | ||||||
* | | | | Instantiate each part of our routing system: | Aaron Patterson | 2011-09-12 | 1 | -7/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | * A collection of Routes * The Router, which consults the collection of routes * A formatter that consults the collection of routes | |||||
* | | | | stop freezing the routes | Aaron Patterson | 2011-09-12 | 1 | -1/+0 | |
| | | | | ||||||
* | | | | stop using a hash for parameterizing | Aaron Patterson | 2011-09-12 | 1 | -11/+9 | |
| | | | | ||||||
* | | | | Switching rack-mount to journey. | Aaron Patterson | 2011-09-12 | 2 | -2/+3 | |
| | | | | ||||||
* | | | | Remove odd asignation | Guillermo Iguaran | 2011-09-12 | 1 | -1/+0 | |
| | | | | ||||||
* | | | | 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 | |
| | | | ||||||
* | | | Merge pull request #2974 from md5/csrf_token_warning | Santiago Pastorino | 2011-09-10 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Use ensure instead of rescue | |||||
| * | | | Use ensure instead of rescue | Mike Dillon | 2011-09-10 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #2972 from md5/master | Aaron Patterson | 2011-09-10 | 3 | -1/+19 | |
|\| | | | | | | | | | | | Use log.warn instead of debug for CSRF token warning | |||||
| * | | | Fix changelog entry | Mike Dillon | 2011-09-10 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Add test for warning and CHANGELOG entry | Mike Dillon | 2011-09-10 | 2 | -0/+18 | |
| | | | | ||||||
| * | | | Change log level for CSRF token verification warning | Mike Dillon | 2011-09-10 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | No need to use </form> here. It's already in whole_form block | Arun Agrawal | 2011-09-10 | 1 | -2/+1 | |
|/ / / | ||||||
* | | | Merge pull request #2876 from alex3/patch-1 | Santiago Pastorino | 2011-09-09 | 1 | -0/+2 | |
|\ \ \ | |_|/ |/| | | Fixed assets precompile regex | |||||
| * | | Fixed assets precompile regex, now accepts Procs | Alex Yakoubian | 2011-09-08 | 1 | -0/+2 | |
| | | | ||||||
* | | | Pull up a method we only use once. | Aaron Patterson | 2011-09-08 | 1 | -5/+1 | |
| | | | ||||||
* | | | Conditions must never be equal | Aaron Patterson | 2011-09-08 | 1 | -6/+1 | |
|/ / | ||||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-09-08 | 1 | -2/+2 | |
|\ \ | ||||||
| * | | Fixing `record_key_for_dom_id` documentation. | Nicolás Hock Isaza | 2011-09-07 | 1 | -1/+1 | |
| | | | | | | | | | The default implementation joins everything with '_' and not with '-' | |||||
| * | | Fix grammar for content_tag_for and div_for docs. | Hendy Tanata | 2011-09-05 | 1 | -2/+2 | |
| | | | ||||||
* | | | Merge pull request #2499 from akaspick/assert_select_email_fix | Jon Leighton | 2011-09-07 | 2 | -2/+21 | |
|\ \ \ | | | | | | | | | Fix assert_select_email to work on non-multipart emails as well as converting the Mail::Body to a string to prevent errors. | |||||
| * | | | fix assert_select_email to work on non-multipart emails as well as ↵ | Andrew Kaspick | 2011-08-11 | 2 | -2/+21 | |
| | | | | | | | | | | | | | | | | converting the Mail::Body to a string to prevent errors. | |||||
* | | | | Nicolás Hock Isaza | 2011-09-06 | 1 | -1/+1 | ||
| | | | | | | | | | | | | | | | | | | | | Fixing `record_key_for_dom_id` documentation. The default implementation joins everything with '_' and not with '-' | |||||
* | | | | Eliminate newlines in basic auth. fixes #2882 | Aaron Patterson | 2011-09-06 | 2 | -1/+9 | |
| |_|/ |/| | | ||||||
* | | | Merge pull request #2577 from rails-noob/master | Santiago Pastorino | 2011-09-06 | 1 | -1/+3 | |
|\ \ \ | | | | | | | | | Fix double slash at start of paths when mounting an engine at the root. | |||||
| * | | | Fix bug #2579. | rails-noob | 2011-09-06 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | Avoids double slash at start of paths when mounting an engine at the root. | |||||
* | | | | 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 |