Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
* | | | | | Merge pull request #2851 from dasch/patch-6 | Jon Leighton | 2011-09-06 | 1 | -5/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | No need to use a begin block there | ||||
| * | | | | | No need to use a begin block there | Daniel Schierbeck | 2011-09-04 | 1 | -5/+3 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #2872 from sikachu/content_tag_html_safe | Santiago Pastorino | 2011-09-05 | 2 | -1/+13 |
|\ \ \ \ \ | | | | | | | | | | | | | Make sure that result from content_tag_for with collection is html_safe | ||||
| * | | | | | Make sure that result from content_tag_for with collection is html_safe | Prem Sichanugrist | 2011-09-05 | 2 | -1/+13 |
| | | | | | | | | | | | | | | | | | | Thank you @spastorino for catching the empty test in b84cee0, as I totally forgot that I still have to make it html_safe. | ||||
* | | | | | | Merge pull request #2815 from avakhov/current-page-non-get-requests | Santiago Pastorino | 2011-09-05 | 2 | -2/+16 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | current_page? returns false for non-GET requests | ||||
| * | | | | | | current_page? returns false for non-GET requests | Alexey Vakhov | 2011-09-02 | 2 | -2/+16 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #2799 from tomstuart/3-1-stable | Santiago Pastorino | 2011-09-05 | 2 | -3/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Never return stored content from content_for when a block is given | ||||
* | | | | | | | add blanks between methods | Vijay Dev | 2011-09-05 | 1 | -0/+3 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Remove empty test | Santiago Pastorino | 2011-09-05 | 1 | -3/+0 |
| | | | | | | |||||
* | | | | | | Merge pull request #2863 from ↵ | Santiago Pastorino | 2011-09-04 | 1 | -0/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | raybaxter/silence_unitialized_instance_variable_warnings Silence unitialized instance variable warnings | ||||
| * | | | | | | Tests shouldn't produce warnings | Ray Baxter | 2011-09-04 | 1 | -0/+5 |
| | | | | | | |