Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | | | Fix broken asset test | Guillermo Iguaran | 2011-09-13 | 1 | -2/+2 |
| | | | | |||||
| * | | | Don't mount Sprockets at config.assets.prefix if config.assets.compile is false. | Mark J. Titorenko | 2011-09-13 | 2 | -2/+16 |
|/ / / | |||||
* | | | Stop trying to be clever about when to define attribute methods. | Jon Leighton | 2011-09-14 | 2 | -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 Leighton | 2011-09-14 | 2 | -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 Leighton | 2011-09-14 | 1 | -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 Pastorino | 2011-09-13 | 3 | -0/+6 |
| | | | | | | | | | | | | static files and emails | ||||
* | | | Rename first_or_new to first_or_initialize. | Jon Leighton | 2011-09-13 | 5 | -28/+15 |
| | | | | | | | | | | | | | | | For consistency with find_or_initialize_by. Also remove first_or_build alias. | ||||
* | | | delete stray backup files from guides sample app | Vijay Dev | 2011-09-13 | 2 | -62/+0 |
| |/ |/| | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-09-13 | 7 | -83/+15 |
|\ \ | |||||
| * | | Fixed markup error. | 45north | 2011-09-13 | 1 | -1/+1 |
| | | | |||||
| * | | Fix typo | Mike Gunderloy | 2011-09-13 | 1 | -1/+1 |
| | | | |||||
| * | | getting_started.textile: Fix typo and split up a sentence in section ↵ | dharmatech | 2011-09-12 | 1 | -2/+2 |
| | | | | | | | | | | | | "Building a Multi-Model Form" | ||||
| * | | Merge pull request #67 from alanzeino/master | Vijay Dev | 2011-09-12 | 1 | -2/+2 |
| |\ \ | | | | | | | | | 'Getting Started' guide typo fix | ||||
| | * | | Slight change to reflect current 'destroy' code generated by scaffold in 3.1 ↵ | Alan Zeino | 2011-09-12 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | release. | ||||
| * | | | Delete contribute.textile now that its contents are merged to the ↵ | Vijay Dev | 2011-09-12 | 1 | -70/+0 |
| | | | | | | | | | | | | | | | | contributing_to_ruby_on_rails guide | ||||
| * | | | change GH issue tracker url | Vijay Dev | 2011-09-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | getting_started.textile: Fix typos in section "Rendering a Partial Form" | dharmatech | 2011-09-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix a typo in date | Semyon Perepelitsa | 2011-09-12 | 1 | -1/+1 |
| |/ / | |||||
| * | | merged the contribution guides and changed the | Vijay Dev | 2011-09-11 | 2 | -5/+7 |
| | | | | | | | | | | | | link in the layout accordingly |