aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #2964 from msgehard/silence_warningsSantiago Pastorino2011-09-141-9/+2
|\ \ \ \ | |/ / / |/| | |
| * | | 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
|\ \ \ \ | |_|/ / |/| | |
| * | | 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
* | | Generate attribute method unless it's already in the module.Jon Leighton2011-09-142-1/+24
* | | We don't need to build a set for DangerousAttributeError.Jon Leighton2011-09-141-7/+13
* | | Provide a way to access to assets without using the digest, useful for static...Santiago Pastorino2011-09-133-0/+6
* | | Rename first_or_new to first_or_initialize.Jon Leighton2011-09-135-28/+15
* | | 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 "Buildin...dharmatech2011-09-121-2/+2
| * | Merge pull request #67 from alanzeino/masterVijay Dev2011-09-121-2/+2
| |\ \
| | * | Slight change to reflect current 'destroy' code generated by scaffold in 3.1 ...Alan Zeino2011-09-121-2/+2
| * | | Delete contribute.textile now that its contents are merged to the contributin...Vijay Dev2011-09-121-70/+0
| * | | 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
* | | 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 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 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 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_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...Guillermo Iguaran2011-09-133-3/+22
* | | | Merge pull request #2987 from kennyj/masterSantiago Pastorino2011-09-122-0/+19
|\ \ \ \
| * | | | 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
* | | | | 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-123-2/+10