aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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-143-6/+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
| | | |
* | | | Merge pull request #3011 from guilleiguaran/disable-sprockets-serverSantiago Pastorino2011-09-132-3/+17
|\ \ \ \ | |_|/ / |/| | | Don't mount Sprockets if config.assets.compile is disabled
| * | | Fix broken asset testGuillermo Iguaran2011-09-131-2/+2
| | | |
| * | | Don't mount Sprockets at config.assets.prefix if config.assets.compile is false.Mark J. Titorenko2011-09-132-2/+16
|/ / /
* | | Stop trying to be clever about when to define attribute methods.Jon Leighton2011-09-142-34/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | There is no meaningful performance penalty in defining attribute methods, since it only happens once. There is also no reason *not* to define them, since they get thrown in an included module, so they will not 'overwrite' anything. In fact, this is desirable, since it allows us to call super.
* | | Generate attribute method unless it's already in the module.Jon Leighton2011-09-142-1/+24
| | | | | | | | | | | | | | | | | | | | | There's no harm in generating a method name that's already defined on the host class, since we're generating the attribute methods in a module that gets included. In fact, this is desirable as it allows the host class to call super.
* | | We don't need to build a set for DangerousAttributeError.Jon Leighton2011-09-141-7/+13
| | | | | | | | | | | | We can just use method_defined? and private_method_defined?
* | | Provide a way to access to assets without using the digest, useful for ↵Santiago Pastorino2011-09-133-0/+6
| | | | | | | | | | | | static files and emails
* | | Rename first_or_new to first_or_initialize.Jon Leighton2011-09-135-28/+15
| | | | | | | | | | | | | | | For consistency with find_or_initialize_by. Also remove first_or_build alias.
* | | delete stray backup files from guides sample appVijay Dev2011-09-132-62/+0
| |/ |/|
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-137-83/+15
|\ \
| * | Fixed markup error.45north2011-09-131-1/+1
| | |
| * | Fix typoMike Gunderloy2011-09-131-1/+1
| | |
| * | getting_started.textile: Fix typo and split up a sentence in section ↵dharmatech2011-09-121-2/+2
| | | | | | | | | | | | "Building a Multi-Model Form"
| * | Merge pull request #67 from alanzeino/masterVijay Dev2011-09-121-2/+2
| |\ \ | | | | | | | | 'Getting Started' guide typo fix
| | * | Slight change to reflect current 'destroy' code generated by scaffold in 3.1 ↵Alan Zeino2011-09-121-2/+2
| | | | | | | | | | | | | | | | release.
| * | | Delete contribute.textile now that its contents are merged to the ↵Vijay Dev2011-09-121-70/+0
| | | | | | | | | | | | | | | | contributing_to_ruby_on_rails guide
| * | | change GH issue tracker urlVijay Dev2011-09-121-1/+1
| | | |
| * | | getting_started.textile: Fix typos in section "Rendering a Partial Form"dharmatech2011-09-121-1/+1
| | | |
| * | | Fix a typo in dateSemyon Perepelitsa2011-09-121-1/+1
| |/ /
| * | merged the contribution guides and changed theVijay Dev2011-09-112-5/+7
| | | | | | | | | | | | link in the layout accordingly
* | | Fix asset_path relative_url_root methodSantiago Pastorino2011-09-132-7/+5
| | |
* | | Merge pull request #3001 from guilleiguaran/fix-assets-precompile-host-testSantiago Pastorino2011-09-131-1/+1
|\ \ \ | | | | | | | | Fix precompile asset_host test
| * | | Fix precompile asset_host testGuillermo Iguaran2011-09-131-1/+1
|/ / /
* | | Merge pull request #3000 from guilleiguaran/fix-relative-url-rootSantiago Pastorino2011-09-131-4/+2
|\ \ \ | | | | | | | | Fix for relative url root in assets
| * | | Fix for relative url root in assetsGuillermo Iguaran2011-09-131-4/+2
|/ / /
* | | Merge pull request #2996 from guilleiguaran/move-assets-testsSantiago Pastorino2011-09-132-31/+31
|\ \ \ | | | | | | | | Move asset tests to assets_test file
| * | | Move asset tests to assets_test fileGuillermo Iguaran2011-09-132-31/+31
| | | |
* | | | always rewrite_relative_url_rootSantiago Pastorino2011-09-132-6/+2
|/ / /
* | | Merge pull request #2993 from deepakprasanna/generator_test_fixSantiago Pastorino2011-09-121-1/+1
|\ \ \ | | | | | | | | fixed the failing generators_test in railties.
| * | | fixed the failing generators_testDeepak Prasanna2011-09-131-1/+1
|/ / /
* | | 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-122-0/+19
|\ \ \ \ | | | | | | | | | | fix https://github.com/rails/rails/issues/2947 (with testcase)
| * | | | fix https://github.com/rails/rails/issues/2947 (with testcase)kennyj2011-09-132-0/+19
| | | | |
* | | | | removing backwards compatibility moduleAaron Patterson2011-09-123-9/+8
| | | | |
* | | | | point rails at Journey for dev and edgeAaron Patterson2011-09-122-0/+3
| | | | |
* | | | | 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
| | | | |
* | | | | adjust route inspection to work with JourneyAaron Patterson2011-09-121-1/+2
| | | | |
* | | | | 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
| | | | |