aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge pull request #3395 from bdurand/fix_file_store_cleanup"José Valim2011-10-252-52/+3
| | | | | | | Tests were failing on Travis-CI. This reverts commit 79d01a8f16e20c556a086a2f07e3ccb4400f9819, reversing changes made to b838570bd69ff13d677fb43e79f10d6f3168c696.
* Unused variable removedArun Agrawal2011-10-241-1/+1
|
* Merge pull request #3395 from bdurand/fix_file_store_cleanupJosé Valim2011-10-212-3/+52
|\ | | | | Fix ActiveSupport::Cache::FileStore.cleanup to actually work.
| * Fix ActiveSupport::Cache::FileStore.cleanup to actually work.Brian Durand2011-10-212-3/+52
| |
* | Fix threading issues with BufferedLogger.Brian Durand2011-10-212-8/+89
|/
* Checking blank if tag might coming nil or blankArun Agrawal2011-10-212-1/+7
| | | In log it should not show the empty array.
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-10-201-3/+3
|\
| * Fixed misleading docs for String#to_formatted_s(:db)Martin Svalin2011-10-201-3/+3
| |
* | Ensure TaggegLogging is thread safe.José Valim2011-10-192-14/+51
| |
* | Programatically define the log level methods and use the Logger constants ↵David Heinemeier Hansson2011-10-191-23/+8
| | | | | | | | instead (SyslogLogger didnt define them as I expected)
* | Added X-Request-Id tracking and TaggedLogging to easily log that and other ↵David Heinemeier Hansson2011-10-194-0/+110
| | | | | | | | production concerns
* | Merge pull request #3151 from zenprogrammer/pluralize_without_countJosé Valim2011-10-172-7/+22
|\ \ | |/ |/| Added include_count parameter to pluralize.
| * Modified String#pluralize to take an optional count parameter.Ryan Oblak2011-09-282-7/+22
| |
* | Fixed test_nonexisting_method_with_arguments to revert commit 29a5aeaYasuo Honda2011-10-061-1/+1
| |
* | Revert "don't raise NoMethodError the tried method doesn't exists"José Valim2011-10-062-3/+1
| | | | | | | | This reverts commit 29a5aeaae976bf8432d57ec996c7c81932a39de6.
* | ruby193: String#prepend is also unsafeAkira Matsuda2011-10-051-1/+1
| |
* | override unsafe methods only if defined on StringAkira Matsuda2011-10-051-10/+12
| |
* | to_formatted_s is an instance method for a Range not an ArrayAyrton De Craene2011-10-041-1/+1
| |
* | Merge pull request #2801 from jeremyevans/patch-1Jeremy Kemper2011-10-032-1/+4
|\ \ | | | | | | Fix obviously breakage of Time.=== for Time subclasses
| * | Add tests for fixes to Time.===Jeremy Evans2011-09-071-0/+3
| | |
| * | Edited activesupport/lib/active_support/core_ext/time/calculations.rb via GitHubJeremy Evans2011-09-011-1/+1
| | |
* | | Rescuable spelling errorChristian Höltje2011-10-031-1/+1
| | |
* | | Merge pull request #3174 from phuibonhoa/masterJosé Valim2011-10-022-0/+9
|\ \ \ | | | | | | | | Fixed file store to handle delete_matched being called before cache dir is created.
| * | | Improved testing so that it tests the real functionality and not the private ↵Philippe Huibonhoa2011-10-021-4/+5
| | | | | | | | | | | | | | | | method.
| * | | Added fix so that file store does not raise an exception when cache dir does ↵Philippe Huibonhoa2011-09-292-0/+8
| | |/ | |/| | | | | | | not exist yet. This can happen if a delete_matched is called before anything is saved in the cache.
* | | Set the default options value for as_json in the encoder object.José Valim2011-09-302-3/+3
| | |
* | | Fixing `as_json` method for ActiveRecord models.Nicolás Hock Isaza2011-09-291-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_escapeAlexey Vakhov2011-09-241-1/+1
| |
* | Minor doc fix to String#constantizeRyan Oblak2011-09-231-3/+3
| |
* | Update CHANGELOG for safe_constantize.José Valim2011-09-232-1/+6
| |
* | Use safe_constantize where possible.José Valim2011-09-231-3/+1
| |
* | Ensure that constantize just rescues NameError that applies to the constant ↵José Valim2011-09-232-4/+26
| | | | | | | | being currently loaded.
* | Added ActiveSupport::Inflector.safe_constantize and String#safe_constantize; ↵Ryan Oblak2011-09-235-21/+106
| | | | | | | | refactored common constantize tests into ConstantizeTestCases
* | No need to create a range objectSantiago Pastorino2011-09-221-3/+3
| |
* | Merge pull request #3096 from phuibonhoa/masterSantiago Pastorino2011-09-222-10/+18
|\ \ | | | | | | FileStore key_file_path does not properly limit filenames to 255 characters
| * | Updated existing test that fails with this fix ↵Philippe Huibonhoa2011-09-211-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 Huibonhoa2011-09-212-9/+17
| | | | | | | | | | | | for the file system. (https://github.com/rails/rails/issues/3072)
* | | fix incorrect commentVijay Dev2011-09-221-1/+1
| | |
* | | Fix test to reflect use of to_param for keysbrainopia2011-09-181-8/+8
|/ /
* | 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
| | |
* | | Proper lines numbers for stack trace infoSantiago Pastorino2011-09-161-1/+1
|/ /
* | Fix typo in deprecation noticeClaudio Poli2011-09-161-1/+1
| |
* | Fix typo in deprecation warning.Peter Suschlik2011-09-161-1/+1
| |
* | 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.
* | 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
| |
* | 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.