Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | update guides, use html safe translations in i18n | Alexey Vakhov | 2011-09-15 | 2 | -0/+22 | |
| | | | | | ||||||
* | | | | | Merge pull request #3065 from brainopia/fix_to_param_test | Santiago Pastorino | 2011-09-20 | 1 | -8/+8 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | Fix test to reflect use of to_param for keys | |||||
| * | | | | Fix test to reflect use of to_param for keys | brainopia | 2011-09-18 | 1 | -8/+8 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #3064 from arunagw/jruby_test_fix_query_cache_test | Santiago Pastorino | 2011-09-19 | 1 | -2/+4 | |
|\ \ \ \ | |/ / / |/| | | | fix test error when running with postgresql. | |||||
| * | | | fix test error when running with postgresql. | Arun Agrawal | 2011-09-18 | 1 | -2/+4 | |
|/ / / | | | | | | | | | | | | | This Sqlite3 should be in if block. Was giving error because sqlite3 is not loaded | |||||
* | | | to_xml should also rely on serializable hash. | José Valim | 2011-09-18 | 3 | -32/+33 | |
| | | | ||||||
* | | | Merge pull request #3049 from brainopia/fix_to_query_edge_case | Santiago Pastorino | 2011-09-17 | 2 | -1/+10 | |
|\ \ \ | | | | | | | | | Fix Hash#to_query edge case with html_safe string on 1.8 ruby | |||||
| * | | | Fix Hash#to_query edge case with html_safe string on 1.8 ruby | brainopia | 2011-09-16 | 2 | -1/+10 | |
| | | | | ||||||
* | | | | Merge pull request #3057 from arunagw/arjdbc_bump_master | Santiago Pastorino | 2011-09-17 | 1 | -3/+3 | |
|\ \ \ \ | | | | | | | | | | | Bump AR-JDBC version. | |||||
| * | | | | Bump AR-JDBC version. | Arun Agrawal | 2011-09-17 | 1 | -3/+3 | |
| | |_|/ | |/| | | | | | | THis version is compatible with 3.1 and above | |||||
* | | | | Merge pull request #3058 from arunagw/jruby_query_cache_test | Santiago Pastorino | 2011-09-17 | 1 | -1/+2 | |
|\ \ \ \ | |/ / / |/| | | | Fixed test for JRuby. | |||||
| * | | | Fixed test for JRuby. | Arun Agrawal | 2011-09-18 | 1 | -1/+2 | |
|/ / / | | | | | | | for Sqlite3 in AR-JDBC.It's Jdbc::SQLite3::VERSION | |||||
* / / | Proper lines numbers for stack trace info | Santiago Pastorino | 2011-09-16 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #3048 from masterkain/patch-2 | Vijay Dev | 2011-09-16 | 1 | -1/+1 | |
|\ \ | | | | | | | Fix typo in deprecation notice | |||||
| * | | Fix typo in deprecation notice | Claudio Poli | 2011-09-16 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #3042 from splattael/patch-1 | Vijay Dev | 2011-09-16 | 1 | -1/+1 | |
|\ \ | | | | | | | Fix typo in deprecation warning. | |||||
| * | | Fix typo in deprecation warning. | Peter Suschlik | 2011-09-16 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #3040 from ↵ | José Valim | 2011-09-15 | 2 | -17/+0 | |
|\ \ | | | | | | | | | | | | | guilleiguaran/asset-host-should-not-be-nil-precompile config.action_controller.asset_host shouldn't set to nil during precompile | |||||
| * | | config.action_controller.asset_host shouldn't set to nil during precompile | Guillermo Iguaran | 2011-09-15 | 2 | -17/+0 | |
|/ / | ||||||
* | | Merge pull request #3037 from wvanbergen/master | José Valim | 2011-09-15 | 4 | -22/+40 | |
|\ \ | | | | | | | MessageVerifier: set serializer and crypto algorithm using an option hash | |||||
| * | | Test deprecation warning when not using an options hash as second parameter. | Willem van Bergen | 2011-09-15 | 2 | -2/+14 | |
| | | | ||||||
| * | | Use an options hash to specify digest/cipher algorithm and a serializer for ↵ | Willem van Bergen | 2011-09-15 | 4 | -20/+26 | |
| | | | | | | | | | | | | MessageVerifier and MessageEncryptor. | |||||
* | | | Merge pull request #3035 from wvanbergen/master | José Valim | 2011-09-15 | 4 | -18/+39 | |
|\| | | | | | | | | Make API for custom message serializers nicer. | |||||
| * | | Add some documentation for the new serializer property of MessageVerifier ↵ | Willem van Bergen | 2011-09-15 | 1 | -0/+5 | |
| | | | | | | | | | | | | and MessageEncryptor. | |||||
| * | | Implement API suggestions of pull request. | Willem van Bergen | 2011-09-15 | 4 | -18/+34 | |
| | | | ||||||
* | | | Merge pull request #3031 from wvanbergen/master | José Valim | 2011-09-15 | 4 | -5/+30 | |
|\| | | | | | | | | Custom serializers and deserializers in MessageVerifier and MessageEncryptor. | |||||
| * | | Fixed tests so that they will also run properly in other timezones. | Willem van Bergen | 2011-09-15 | 2 | -4/+4 | |
| | | | ||||||
| * | | Custom serializers and deserializers in MessageVerifier and MessageEncryptor. | Willem van Bergen | 2011-09-15 | 4 | -5/+30 | |
|/ / | | | | | | | | | By default, these classes use Marshal for serializing and deserializing messages. Unfortunately, the Marshal format is closely associated with Ruby internals and even changes between different interpreters. This makes the resulting message very hard to impossible to unserialize messages generated by these classes in other environments like node.js. This patch solves this by allowing you to set your own custom serializer and deserializer lambda functions. By default, it still uses Marshal to be backwards compatible. | |||||
* / | Allow asset tag helper methods to accept :digest => false option in order to ↵ | Santiago Pastorino | 2011-09-14 | 8 | -39/+58 | |
|/ | | | | completely avoid the digest generation. | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-09-15 | 31 | -233/+74 | |
|\ | ||||||
| * | No more changelogs inside guides | Vijay Dev | 2011-09-15 | 27 | -211/+0 | |
| | | ||||||
| * | Mention that old fixes are to be done on 3-0-stable | Vijay Dev | 2011-09-14 | 1 | -3/+3 | |
| | | ||||||
| * | minor edit | Vijay Dev | 2011-09-14 | 1 | -1/+1 | |
| | | ||||||
| * | change first_or_new to first_or_initialize as per 11870117, and some edits | Vijay Dev | 2011-09-14 | 1 | -10/+12 | |
| | | ||||||
| * | forgot to sign my name to the Changelog | Dallas Reedy | 2011-09-14 | 1 | -1/+1 | |
| | | ||||||
| * | Removed mention of deprecated proxy methods in favor of using proxy_association. | Dallas Reedy | 2011-09-14 | 1 | -4/+5 | |
| | | ||||||
| * | remove info about guides hackfest | Vijay Dev | 2011-09-14 | 1 | -1/+0 | |
| | | ||||||
| * | Add equivalent nginx configuration | Ben Walding | 2011-09-14 | 1 | -1/+15 | |
| | | ||||||
| * | Add documentation for the extending method in ActiveRecord:QueryMethods | Ryan Bigg | 2011-09-14 | 1 | -0/+36 | |
| | | ||||||
| * | Fix typos and broken link on asset pipeline guide | Jaime Iniesta | 2011-09-14 | 1 | -3/+3 | |
| | | ||||||
| * | [:class_name] option in belongs_to should mention belongs_to and not has_one | Erik Behrends | 2011-09-13 | 1 | -1/+1 | |
| | | ||||||
* | | update 3.1 release date in changelogs | Vijay Dev | 2011-09-14 | 6 | -6/+6 | |
| | | ||||||
* | | Merge pull request #3015 from guilleiguaran/clear-tmp-cache-on-precompile | José Valim | 2011-09-14 | 1 | -0/+1 | |
|\ \ | | | | | | | Clear cache before of each precompile to avoid inconsistencies. Fixes #3014 | |||||
| * | | Clear cache before of each precompile to avoid inconsistencies. Fixes #3014 | Guillermo Iguaran | 2011-09-13 | 1 | -0/+1 | |
| | | | ||||||
* | | | Merge pull request #3012 from guilleiguaran/3-1-1-changelogs | Santiago Pastorino | 2011-09-14 | 1 | -0/+4 | |
|\ \ \ | | | | | | | | | Add missing changelog entries for actionpack | |||||
| * | | | Add missing changelog entries for actionpack | Guillermo Iguaran | 2011-09-13 | 1 | -0/+4 | |
| | | | | ||||||
* | | | | Revert "Provide a way to access to assets without using the digest, useful ↵ | Santiago Pastorino | 2011-09-14 | 3 | -6/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | for static files and emails" This reverts commit 82afaa06861d03f6a2887d40e40c0ded76db88db. | |||||
* | | | | Merge pull request #2964 from msgehard/silence_warnings | Santiago Pastorino | 2011-09-14 | 1 | -9/+2 | |
|\ \ \ \ | |/ / / |/| | | | Silence Ruby warnings about uninitialized instance variable. | |||||
| * | | | Silence Ruby warnings about uninitialized instance variable. | Mike Gehard | 2011-09-09 | 1 | -9/+2 | |
| | | | | ||||||
* | | | | Merge pull request #3011 from guilleiguaran/disable-sprockets-server | Santiago Pastorino | 2011-09-13 | 2 | -3/+17 | |
|\ \ \ \ | |_|/ / |/| | | | Don't mount Sprockets if config.assets.compile is disabled |