aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2977 from guilleiguaran/fix-relative-root-in-assetsSantiago Pastorino2011-09-123-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 Iguaran2011-09-133-3/+22
| | | | | | | | | | | | Sprockets. Fix #2435 See https://github.com/rails/sass-rails/issues/42 for details
* | Merge pull request #2987 from kennyj/masterSantiago Pastorino2011-09-121-0/+3
|\ \ | | | | | | fix https://github.com/rails/rails/issues/2947 (with testcase)
| * | fix https://github.com/rails/rails/issues/2947 (with testcase)kennyj2011-09-131-0/+3
| | |
* | | removing backwards compatibility moduleAaron Patterson2011-09-123-9/+8
| | |
* | | partially expand the parameters to `match`Aaron Patterson2011-09-121-3/+3
| | |
* | | unfactor the Route class to private factory methodsAaron Patterson2011-09-122-45/+42
| | |
* | | reduce dependencies of external objects in the Route classAaron Patterson2011-09-122-16/+18
| | |
* | | delete unused code, pass path explicitly to journeyAaron Patterson2011-09-122-28/+7
| | |
* | | all routes can be stored in the Journey Routes objectAaron Patterson2011-09-123-6/+6
| | |
* | | clear! does not need to be called from initializeAaron Patterson2011-09-121-4/+3
| | |
* | | reuse the route collection and formatter by clearing themAaron Patterson2011-09-121-6/+10
| | |
* | | Instantiate each part of our routing system:Aaron Patterson2011-09-121-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 routesAaron Patterson2011-09-121-1/+0
| | |
* | | stop using a hash for parameterizingAaron Patterson2011-09-121-11/+9
| | |
* | | Switching rack-mount to journey.Aaron Patterson2011-09-122-2/+3
| | |
* | | Remove odd asignationGuillermo Iguaran2011-09-121-1/+0
| | |
* | | Merge pull request #2985 from kennyj/masterSantiago Pastorino2011-09-121-1/+1
|\| | | |/ |/| fix https://github.com/rails/rails/issues/2582 (with testcase)
| * fix https://github.com/rails/rails/issues/2582 (with testcase)kennyj2011-09-131-1/+1
| |
* | Merge pull request #2974 from md5/csrf_token_warningSantiago Pastorino2011-09-101-1/+1
|\ \ | | | | | | Use ensure instead of rescue
| * | Use ensure instead of rescueMike Dillon2011-09-101-1/+1
| | |
* | | Merge pull request #2972 from md5/masterAaron Patterson2011-09-103-1/+19
|\| | | | | | | | Use log.warn instead of debug for CSRF token warning
| * | Fix changelog entryMike Dillon2011-09-101-1/+1
| | |
| * | Add test for warning and CHANGELOG entryMike Dillon2011-09-102-0/+18
| | |
| * | Change log level for CSRF token verification warningMike Dillon2011-09-101-1/+1
| | |
* | | No need to use </form> here. It's already in whole_form blockArun Agrawal2011-09-101-2/+1
|/ /
* | Merge pull request #2876 from alex3/patch-1Santiago Pastorino2011-09-091-0/+2
|\ \ | | | | | | Fixed assets precompile regex
| * | Fixed assets precompile regex, now accepts ProcsAlex Yakoubian2011-09-081-0/+2
| | |
* | | Pull up a method we only use once.Aaron Patterson2011-09-081-5/+1
| | |
* | | Conditions must never be equalAaron Patterson2011-09-081-6/+1
|/ /
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-081-2/+2
|\ \
| * | Fixing `record_key_for_dom_id` documentation. Nicolás Hock Isaza2011-09-071-1/+1
| | | | | | | | | The default implementation joins everything with '_' and not with '-'
| * | Fix grammar for content_tag_for and div_for docs.Hendy Tanata2011-09-051-2/+2
| | |
* | | Merge pull request #2499 from akaspick/assert_select_email_fixJon Leighton2011-09-072-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 Kaspick2011-08-112-2/+21
| | | | | | | | | | | | | | | | converting the Mail::Body to a string to prevent errors.
* | | | Nicolás Hock Isaza2011-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | Fixing `record_key_for_dom_id` documentation. The default implementation joins everything with '_' and not with '-'
* | | | Eliminate newlines in basic auth. fixes #2882Aaron Patterson2011-09-062-1/+9
| |_|/ |/| |
* | | Merge pull request #2577 from rails-noob/masterSantiago Pastorino2011-09-061-1/+3
|\ \ \ | | | | | | | | Fix double slash at start of paths when mounting an engine at the root.
| * | | Fix bug #2579.rails-noob2011-09-061-1/+3
| | | | | | | | | | | | | | | | Avoids double slash at start of paths when mounting an engine at the root.
* | | | Merge pull request #2889 from guilleiguaran/perform-caching-assetsSantiago Pastorino2011-09-061-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 Iguaran2011-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | pipeline, instead we are using config.assets.digest now
* | | | | Merge pull request #2851 from dasch/patch-6Jon Leighton2011-09-061-5/+3
|\ \ \ \ \ | | | | | | | | | | | | No need to use a begin block there
| * | | | | No need to use a begin block thereDaniel Schierbeck2011-09-041-5/+3
| | |_|_|/ | |/| | |
* | | | | Merge pull request #2872 from sikachu/content_tag_html_safeSantiago Pastorino2011-09-052-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_safePrem Sichanugrist2011-09-052-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-requestsSantiago Pastorino2011-09-052-2/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | current_page? returns false for non-GET requests
| * | | | | | current_page? returns false for non-GET requestsAlexey Vakhov2011-09-022-2/+16
| | | | | | |
* | | | | | | Merge pull request #2799 from tomstuart/3-1-stableSantiago Pastorino2011-09-052-3/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Never return stored content from content_for when a block is given
* | | | | | | add blanks between methodsVijay Dev2011-09-051-0/+3
| |/ / / / / |/| | | | |
* | | | | | Remove empty testSantiago Pastorino2011-09-051-3/+0
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 07:45:09 +0000