aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix ActiveResource JSON error parser and incorrect testsDenis Odorcic2011-09-162-4/+18
* Merge pull request #3042 from splattael/patch-1Vijay Dev2011-09-161-1/+1
|\
| * Fix typo in deprecation warning.Peter Suschlik2011-09-161-1/+1
|/
* Merge pull request #3040 from guilleiguaran/asset-host-should-not-be-nil-prec...José Valim2011-09-152-17/+0
|\
| * config.action_controller.asset_host shouldn't set to nil during precompileGuillermo Iguaran2011-09-152-17/+0
|/
* Merge pull request #3037 from wvanbergen/masterJosé Valim2011-09-154-22/+40
|\
| * Test deprecation warning when not using an options hash as second parameter.Willem van Bergen2011-09-152-2/+14
| * Use an options hash to specify digest/cipher algorithm and a serializer for M...Willem van Bergen2011-09-154-20/+26
* | Merge pull request #3035 from wvanbergen/masterJosé Valim2011-09-154-18/+39
|\|
| * Add some documentation for the new serializer property of MessageVerifier and...Willem van Bergen2011-09-151-0/+5
| * Implement API suggestions of pull request.Willem van Bergen2011-09-154-18/+34
* | Merge pull request #3031 from wvanbergen/masterJosé Valim2011-09-154-5/+30
|\|
| * Fixed tests so that they will also run properly in other timezones.Willem van Bergen2011-09-152-4/+4
| * Custom serializers and deserializers in MessageVerifier and MessageEncryptor.Willem van Bergen2011-09-154-5/+30
|/
* Allow asset tag helper methods to accept :digest => false option in order to ...Santiago Pastorino2011-09-148-39/+58
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-1531-233/+74
|\
| * No more changelogs inside guidesVijay Dev2011-09-1527-211/+0
| * Mention that old fixes are to be done on 3-0-stableVijay Dev2011-09-141-3/+3
| * minor editVijay Dev2011-09-141-1/+1
| * change first_or_new to first_or_initialize as per 11870117, and some editsVijay Dev2011-09-141-10/+12
| * forgot to sign my name to the ChangelogDallas Reedy2011-09-141-1/+1
| * Removed mention of deprecated proxy methods in favor of using proxy_association.Dallas Reedy2011-09-141-4/+5
| * remove info about guides hackfestVijay Dev2011-09-141-1/+0
| * Add equivalent nginx configurationBen Walding2011-09-141-1/+15
| * Add documentation for the extending method in ActiveRecord:QueryMethodsRyan Bigg2011-09-141-0/+36
| * Fix typos and broken link on asset pipeline guideJaime Iniesta2011-09-141-3/+3
| * [:class_name] option in belongs_to should mention belongs_to and not has_oneErik Behrends2011-09-131-1/+1
* | update 3.1 release date in changelogsVijay Dev2011-09-146-6/+6
* | 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 #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 actionpackGuillermo Iguaran2011-09-131-0/+4
* | | | Revert "Provide a way to access to assets without using the digest, useful fo...Santiago Pastorino2011-09-143-6/+0
* | | | 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