aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Fixing incorrect notextile tagsVijay Dev2011-09-169-24/+26
| * | | | minor editVijay Dev2011-09-161-1/+1
| * | | | Merge pull request #68 from kirs/masterKir Shatrov2011-09-161-0/+14
| |\ \ \ \
| | * | | | "Passing variables into the translation" section addedKir Shatrov2011-09-161-0/+14
| |/ / / /
| * | | | Add reference about --skip-sprockets to Asset Pipeline GuideGuillermo Iguaran2011-09-151-0/+6
| * | | | update guides, use html safe translations in i18nAlexey Vakhov2011-09-152-0/+22
* | | | | Merge pull request #3065 from brainopia/fix_to_param_testSantiago Pastorino2011-09-201-8/+8
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix test to reflect use of to_param for keysbrainopia2011-09-181-8/+8
| | |_|/ | |/| |
* | | | Merge pull request #3064 from arunagw/jruby_test_fix_query_cache_testSantiago Pastorino2011-09-191-2/+4
|\ \ \ \ | |/ / / |/| | |
| * | | fix test error when running with postgresql.Arun Agrawal2011-09-181-2/+4
|/ / /
* | | to_xml should also rely on serializable hash.José Valim2011-09-183-32/+33
* | | Merge pull request #3049 from brainopia/fix_to_query_edge_caseSantiago Pastorino2011-09-172-1/+10
|\ \ \
| * | | Fix Hash#to_query edge case with html_safe string on 1.8 rubybrainopia2011-09-162-1/+10
* | | | Merge pull request #3057 from arunagw/arjdbc_bump_masterSantiago Pastorino2011-09-171-3/+3
|\ \ \ \
| * | | | Bump AR-JDBC version.Arun Agrawal2011-09-171-3/+3
| | |_|/ | |/| |
* | | | Merge pull request #3058 from arunagw/jruby_query_cache_testSantiago Pastorino2011-09-171-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed test for JRuby. Arun Agrawal2011-09-181-1/+2
|/ / /
* / / Proper lines numbers for stack trace infoSantiago Pastorino2011-09-161-1/+1
|/ /
* | Merge pull request #3048 from masterkain/patch-2Vijay Dev2011-09-161-1/+1
|\ \
| * | Fix typo in deprecation noticeClaudio Poli2011-09-161-1/+1
|/ /
* | 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
|\ \ \