Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Set the default options value for as_json in the encoder object. | José Valim | 2011-09-30 | 2 | -3/+3 | |
| | | | ||||||
* | | | Fixing `as_json` method for ActiveRecord models. | Nicolás Hock Isaza | 2011-09-29 | 1 | -1/+1 | |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | When you've got an AR Model and you override the `as_json` method, you should be able to add default options to the renderer, like this: class User < ActiveRecord::Base def as_json(options = {}) super(options.merge(:except => [:password_digest])) end end This was not possible before this commit. See the added test case. | |||||
* | | remove superfluous to_s in ERB::Util.html_escape | Alexey Vakhov | 2011-09-24 | 1 | -1/+1 | |
| | | ||||||
* | | Minor doc fix to String#constantize | Ryan Oblak | 2011-09-23 | 1 | -3/+3 | |
| | | ||||||
* | | Update CHANGELOG for safe_constantize. | José Valim | 2011-09-23 | 2 | -1/+6 | |
| | | ||||||
* | | Use safe_constantize where possible. | José Valim | 2011-09-23 | 1 | -3/+1 | |
| | | ||||||
* | | Ensure that constantize just rescues NameError that applies to the constant ↵ | José Valim | 2011-09-23 | 2 | -4/+26 | |
| | | | | | | | | being currently loaded. | |||||
* | | Added ActiveSupport::Inflector.safe_constantize and String#safe_constantize; ↵ | Ryan Oblak | 2011-09-23 | 5 | -21/+106 | |
| | | | | | | | | refactored common constantize tests into ConstantizeTestCases | |||||
* | | No need to create a range object | Santiago Pastorino | 2011-09-22 | 1 | -3/+3 | |
| | | ||||||
* | | Merge pull request #3096 from phuibonhoa/master | Santiago Pastorino | 2011-09-22 | 2 | -10/+18 | |
|\ \ | | | | | | | FileStore key_file_path does not properly limit filenames to 255 characters | |||||
| * | | Updated existing test that fails with this fix ↵ | Philippe Huibonhoa | 2011-09-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | (8d63678d1406c5518d437709af0fde717c0248d7). Before the fix the test was giving a false positive, because file_store.key_file_path would return an empty filename (i.e. test/tmp_cache/4D0/F4D rather than test/tmp_cache/4D0/F4D/xxxx…). Even though the fix referenced above divides the filename into directories to prevent it from being too long, it seems that 1000 characters will always raise an error, so reducing the key size to 900). | |||||
| * | | Fixed issue in file store where it could create a filename that was too long ↵ | Philippe Huibonhoa | 2011-09-21 | 2 | -9/+17 | |
| | | | | | | | | | | | | for the file system. (https://github.com/rails/rails/issues/3072) | |||||
* | | | fix incorrect comment | Vijay Dev | 2011-09-22 | 1 | -1/+1 | |
| | | | ||||||
* | | | Fix test to reflect use of to_param for keys | brainopia | 2011-09-18 | 1 | -8/+8 | |
|/ / | ||||||
* | | 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 | |
| | | | ||||||
* | | | Proper lines numbers for stack trace info | Santiago Pastorino | 2011-09-16 | 1 | -1/+1 | |
|/ / | ||||||
* | | Fix typo in deprecation notice | Claudio Poli | 2011-09-16 | 1 | -1/+1 | |
| | | ||||||
* | | Fix typo in deprecation warning. | Peter Suschlik | 2011-09-16 | 1 | -1/+1 | |
| | | ||||||
* | | 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. | |||||
* | | 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 | |
| | | ||||||
* | | 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. | |||||
* | | update 3.1 release date in changelogs | Vijay Dev | 2011-09-14 | 1 | -1/+1 | |
| | | ||||||
* | | Fix a typo in date | Semyon Perepelitsa | 2011-09-12 | 1 | -1/+1 | |
| | | ||||||
* | | revert the changes from c60995f3 - related to marking sub,gsub as ↵ | Vijay Dev | 2011-09-09 | 1 | -20/+1 | |
| | | | | | | | | unavailable to use with safe strings | |||||
* | | delete the CHANGELOG entry re SafeBuffer and sub/gsub, since it has been ↵ | Xavier Noria | 2011-09-08 | 1 | -2/+0 | |
| | | | | | | | | reverted | |||||
* | | Revert removing gsub and sub from safe buffer. | José Valim | 2011-09-08 | 5 | -63/+45 | |
| | | ||||||
* | | mention the issue number for future reference | Xavier Noria | 2011-09-08 | 1 | -1/+1 | |
| | | ||||||
* | | registers removal of sub and friends for safe strings in the CHANGELOG | Xavier Noria | 2011-09-08 | 1 | -0/+2 | |
| | | ||||||
* | | this should have gone with the previous commit | Xavier Noria | 2011-09-08 | 2 | -6/+6 | |
| | | ||||||
* | | copy-edits a couple of exception messages | Xavier Noria | 2011-09-08 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | "Safe Buffer" should either be the constant with the class name, or go in lower case. I've chosen to follow the same terminology that is used in the AS core extensiong guide, "safe string", though "safe buffer" is also used elsewhere, we should pick one. | |||||
* | | better method documentation on disable safe string methods | Damien Mathieu | 2011-09-08 | 1 | -6/+12 | |
| | | ||||||
* | | remove support of symbols on classify and camelize | Damien Mathieu | 2011-09-08 | 4 | -34/+52 | |
| | | ||||||
* | | make gsub and sub unavailable in SafeBuffers - Closes #1555 | Damien Mathieu | 2011-09-08 | 2 | -11/+24 | |
| | | ||||||
* | | Make sure require_tzinfo only calls Kernel#require if TZInfo isn't already ↵ | Tim Lucas | 2011-09-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | present. This wasn't a problem when require_tzinfo was only called from TimeZone#initialize, but now it's being called for every lookup to TimeZone.[] (via lazy_zones_map) TimeZone lookup can occur when unmarshalling TimeWithZone objects, which is where I first saw the big slowdown (500ms for each Rails action that loaded from Rails.cache) | |||||
* | | We can't simply check the first line of the backtrace, | Arun Agrawal | 2011-09-04 | 1 | -4/+6 | |
| | | | | | | because JRuby reports the call to __send__ in the backtrace. | |||||
* | | Modified content in guides and comments | Arun Agrawal | 2011-09-04 | 1 | -2/+2 | |
| | | | | | | | | | | | | for "assert /" warnings. Removed because if somebody will use this code they will get warnings! | |||||
* | | Merge pull request #2827 from sikachu/extractable_ordered_hash | José Valim | 2011-09-03 | 3 | -0/+12 | |
|\ \ | | | | | | | Make `ActiveSupport::OrderedHash` extractable when using `Array#extract_options! | |||||
| * | | Make `ActiveSupport::OrderedHash` extractable when using ↵ | Prem Sichanugrist | 2011-09-03 | 3 | -0/+12 | |
| |/ | | | | | | | | | `Array#extract_options!` `ActiveSupport::OrderedHash` is actually a subclass of the hash, so it does make sense that it should be extractable from the array list. | |||||
* / | docs formatting changes | Vijay Dev | 2011-09-01 | 3 | -4/+4 | |
|/ | ||||||
* | Revert "Ruby 1.8.7+ provides to_date/to_datetime, AS just makes them ↵ | Chris Griego | 2011-08-31 | 1 | -0/+22 | |
| | | | | | | | | public." to support date implementations without private to_date/to_datetime on Time (home_run). This reverts commit 080345baca1076a9788dff4803153600aec31f86. Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | Merge pull request #2723 from guilleiguaran/3-1-0-changelogs | Santiago Pastorino | 2011-08-28 | 1 | -0/+12 | |
| | | | | Update changelogs for Rails 3.1.0 | |||||
* | Revert all the stuff to do with disallowing non-public methods for ↵ | Jon Leighton | 2011-08-25 | 6 | -170/+3 | |
| | | | | Module#delegate | |||||
* | stop circular require warnings | Aaron Patterson | 2011-08-24 | 2 | -2/+0 | |
| | ||||||
* | only backport the to_d method if it does not exist | Aaron Patterson | 2011-08-24 | 1 | -2/+5 | |
| | ||||||
* | dealing with some -w warnings on startup | Aaron Patterson | 2011-08-24 | 1 | -0/+2 | |
| | ||||||
* | Fix autoload_once_paths when using Pathnames & ruby 1.9 | Jonathan del Strother | 2011-08-24 | 2 | -1/+20 | |
| | | | | | | | Under ruby 1.9.2 - "/var/log".starts_with?(Pathname.new("/var")) # => false so setting config.autoload_once_paths with Pathnames would not work |