aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 ruby
| * 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.
| * | Bump AR-JDBC version.Arun Agrawal2011-09-171-3/+3
| | | | | | | | | THis version is compatible with 3.1 and above
* | | Merge pull request #3058 from arunagw/jruby_query_cache_testSantiago Pastorino2011-09-171-1/+2
|\ \ \ | |/ / |/| | Fixed test for JRuby.
| * | Fixed test for JRuby. Arun Agrawal2011-09-181-1/+2
|/ / | | | | for Sqlite3 in AR-JDBC.It's Jdbc::SQLite3::VERSION
* / 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 notice
| * 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.
| * Fix typo in deprecation warning.Peter Suschlik2011-09-161-1/+1
|/
* Merge pull request #3040 from ↵José Valim2011-09-152-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 precompileGuillermo Iguaran2011-09-152-17/+0
|/
* Merge pull request #3037 from wvanbergen/masterJosé Valim2011-09-154-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 Bergen2011-09-152-2/+14
| |
| * Use an options hash to specify digest/cipher algorithm and a serializer for ↵Willem van Bergen2011-09-154-20/+26
| | | | | | | | MessageVerifier and MessageEncryptor.
* | Merge pull request #3035 from wvanbergen/masterJosé Valim2011-09-154-18/+39
|\| | | | | Make API for custom message serializers nicer.
| * Add some documentation for the new serializer property of MessageVerifier ↵Willem van Bergen2011-09-151-0/+5
| | | | | | | | and MessageEncryptor.
| * 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
|\| | | | | Custom serializers and deserializers in MessageVerifier and MessageEncryptor.
| * 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
|/ | | | | 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 Pastorino2011-09-148-39/+58
| | | | completely avoid the digest generation.
* 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 #3014
| * | 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 actionpack
| * | | Add missing changelog entries for actionpackGuillermo Iguaran2011-09-131-0/+4
| | | |
* | | | Revert "Provide a way to access to assets without using the digest, useful ↵Santiago Pastorino2011-09-143-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | for static files and emails" This reverts commit 82afaa06861d03f6a2887d40e40c0ded76db88db.
* | | | Merge pull request #2964 from msgehard/silence_warningsSantiago Pastorino2011-09-141-9/+2
|\ \ \ \ | |/ / / |/| | | Silence Ruby warnings about uninitialized instance variable.
| * | | 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
|\ \ \ \ | |_|/ / |/| | | Don't mount Sprockets if config.assets.compile is disabled
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Leighton2011-09-142-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 Leighton2011-09-141-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 Pastorino2011-09-133-0/+6
| | | | | | | | | | | | static files and emails
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 03:04:03 +0000