aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3015 from guilleiguaran/clear-tmp-cache-on-precompileJosé Valim2011-09-141-0/+1
|\ | | | | Clear cache before of each precompile to avoid inconsistencies. Fixes #3014
| * Clear cache before of each precompile to avoid inconsistencies. Fixes #3014Guillermo Iguaran2011-09-131-0/+1
| |
* | Merge pull request #3012 from guilleiguaran/3-1-1-changelogsSantiago Pastorino2011-09-141-0/+4
|\ \ | | | | | | Add missing changelog entries for actionpack
| * | Add missing changelog entries for actionpackGuillermo Iguaran2011-09-131-0/+4
| | |
* | | Revert "Provide a way to access to assets without using the digest, useful ↵Santiago Pastorino2011-09-141-1/+0
| | | | | | | | | | | | | | | | | | for static files and emails" This reverts commit 82afaa06861d03f6a2887d40e40c0ded76db88db.
* | | Merge pull request #2964 from msgehard/silence_warningsSantiago Pastorino2011-09-141-9/+2
|\ \ \ | |/ / |/| | Silence Ruby warnings about uninitialized instance variable.
| * | Silence Ruby warnings about uninitialized instance variable.Mike Gehard2011-09-091-9/+2
| | |
* | | Don't mount Sprockets at config.assets.prefix if config.assets.compile is false.Mark J. Titorenko2011-09-131-2/+4
| |/ |/|
* | Provide a way to access to assets without using the digest, useful for ↵Santiago Pastorino2011-09-131-0/+1
| | | | | | | | static files and emails
* | Fix asset_path relative_url_root methodSantiago Pastorino2011-09-132-7/+5
| |
* | Fix for relative url root in assetsGuillermo Iguaran2011-09-131-4/+2
| |
* | always rewrite_relative_url_rootSantiago Pastorino2011-09-132-6/+2
| |
* | 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.