Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add cookie.encrypted which returns an EncryptedCookieJar | Santiago Pastorino | 2012-11-03 | 2 | -3/+6 |
| | | | | | | | | | How to use it? cookies.encrypted[:discount] = 45 => Set-Cookie: discount=ZS9ZZ1R4cG1pcUJ1bm80anhQang3dz09LS1mbDZDSU5scGdOT3ltQ2dTdlhSdWpRPT0%3D--ab54663c9f4e3bc340c790d6d2b71e92f5b60315; path=/ cookies.encrypted[:discount] => 45 | ||||
* | Sign cookies using key deriver | Santiago Pastorino | 2012-11-03 | 1 | -0/+10 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-11-03 | 4 | -9/+9 |
|\ | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/mime_responds.rb activerecord/lib/active_record/attribute_methods.rb guides/source/working_with_javascript_in_rails.md | ||||
| * | Adding a missing parenthesis in the doc of String#parameterize. | Geoffrey Roguelon | 2012-10-24 | 1 | -2/+2 |
| | | |||||
| * | fix output messages - docs [ci skip] | Francesco Rodriguez | 2012-10-22 | 4 | -6/+6 |
| | | |||||
| * | More changes around 1.9 hash syntax | AvnerCohen | 2012-10-21 | 2 | -4/+4 |
| | | | | | | | | Added missing space in previous hash related commit | ||||
* | | Fixed timezone mapping of Solomon Islands. | Steve Klabnik | 2012-11-01 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | Fixes #8095. For reference, here is the discussion about the mapping being incorrect: http://rubyforge.org/pipermail/tzinfo-users/2012-November/000114.html | ||||
* | | Make caller attribute in deprecation methods optional | Alexey Gaziev | 2012-10-30 | 13 | -15/+23 |
| | | |||||
* | | Provide a call stack for deprecation warnings where needed. | Nikita Afanasenko | 2012-10-29 | 4 | -6/+12 |
| | | | | | | | | It's sometimes hard to quickly find where deprecated call was performed, especially in case of migrating between Rails versions. So this is an attempt to improve the call stack part of the warning message by providing caller explicitly. | ||||
* | | atomicc.rb: Don't assume we may chown/chmod a file. | Daniele Sluijters | 2012-10-29 | 2 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this code just assumed it is capable of changing the file ownership, both user and group. This will fail in a lot of scenario's unless: * The process is run as a superuser (root); * The owning user and group are already set to the user and group we're trying to chown to; * The user chown'ing only changes the group to another group it is a member of. If either of those conditions are not met the filesystem will simply deny the operation throwing an error. It is also not always possible to do a chmod, there might be a SELinux policy or another limitation preventing the user to change the file mode. To this end the chmod call has also been added to the rescue block. I've also added a little comment above the chmod command that doing a chmod on a file which has an ACL set will cause the ACL to be recalculated / modified. | ||||
* | | Merge pull request #8046 from pmahoney/exceptions_as_flow_control | Rafael Mendonça França | 2012-10-28 | 1 | -2/+2 |
|\ \ | | | | | | | Replace flow-control exception with explicit test. | ||||
| * | | Replace flow-control exception with explicit test. | Patrick Mahoney | 2012-10-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was noticed while profiling 'assets:precompile' in JRuby that exception creation was consuming a large portion of time, and some of that was due to File.atomic_write. Testing first with File.exists? eliminates the need for an exception which should be a perfomrance improvement on both JRuby and MRI. In this case, the stat() isn't even extra overhead, since it is always called. | ||||
* | | | Fix some assert_raise calls containing messages in Active Support | Carlos Antonio da Silva | 2012-10-28 | 2 | -7/+15 |
|/ / | |||||
* | | Fix queueing tests that should be consuming the queue rather than draining it | Jeremy Kemper | 2012-10-26 | 2 | -4/+10 |
| | | |||||
* | | Job consumer logs to Rails.logger by default | Jeremy Kemper | 2012-10-26 | 1 | -2/+5 |
| | | |||||
* | | Job worker thread logs failed jobs too | Jeremy Kemper | 2012-10-26 | 2 | -2/+2 |
| | | |||||
* | | Job worker thread logs to stderr if no logger is provided | Jeremy Kemper | 2012-10-26 | 2 | -2/+13 |
| | | |||||
* | | Implement replace method so key? works correctly. | David Graham | 2012-10-26 | 3 | -0/+22 |
| | | |||||
* | | Remove ActiveRecord::Model consant from AS::TestCase | Carlos Antonio da Silva | 2012-10-26 | 1 | -1/+1 |
| | | | | | | | | Fixing the build. | ||||
* | | make the cache test more @tenderlove(ing) and not depend on internal ↵ | Noah Hendrix | 2012-10-23 | 1 | -2/+7 |
| | | | | | | | | implentation | ||||
* | | pass the key to the block in cache.fetch on misses | Noah Hendrix | 2012-10-23 | 2 | -7/+12 |
|/ | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-10-21 | 5 | -8/+8 |
|\ | | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/slice.rb guides/source/active_support_core_extensions.md | ||||
| * | Hash Syntax changes to 1.9 format | AvnerCohen | 2012-10-20 | 5 | -9/+9 |
| | | |||||
* | | fix assertions | Aaron Patterson | 2012-10-18 | 1 | -2/+2 |
| | | |||||
* | | Make DescendantsTracker thread safe and optimize the #descendants method. | thedarkone | 2012-10-18 | 3 | -30/+51 |
| | | |||||
* | | some ruby interpreters don't have ruby-prof so just skip the tests | Aaron Patterson | 2012-10-18 | 2 | -4/+13 |
| | | | | | | | | rather than exiting the process. | ||||
* | | Revert "remove unnecessary object/conversions file" | Xavier Noria | 2012-10-16 | 4 | -2/+11 |
| | | | | | | | | | | | | | | This file is used at least by Active Merchant, its existence is maybe not necessary but no big deal either. This reverts commit ae9b3d7cecd77b9ace38671b183e1a360bf632b6. | ||||
* | | Backpedal from class-oriented config.queue. Set an actual queue instance. | Jeremy Kemper | 2012-10-12 | 1 | -4/+0 |
| | | |||||
* | | Remove the queue container. Premature consolidation. Set up and maintain ↵ | Jeremy Kemper | 2012-10-12 | 2 | -54/+0 |
| | | | | | | | | queues in the classes that use them instead. | ||||
* | | Merge pull request #7007 from Mik-die/hash_extract | Rafael Mendonça França | 2012-10-12 | 3 | -4/+39 |
|\ \ | | | | | | | make Hash#extract! more symmetric with Hash#slice | ||||
| * | | add more testcases and doc about Hash#extract! | Mikhail Dieterle | 2012-10-08 | 2 | -4/+11 |
| | | | |||||
| * | | make Hash#extract! more symmetric with Hash#slice | Mikhail Dieterle | 2012-10-08 | 3 | -3/+31 |
| | | | |||||
* | | | Move the TestQueue tests to the proper file | Rafael Mendonça França | 2012-10-12 | 1 | -0/+44 |
| | | | |||||
* | | | Merge pull request #7913 from mje113/master | Xavier Noria | 2012-10-12 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | MemCacheStore's move to dalli as a backend broke :race_condition_ttl support | ||||
| * | | | Padding expires_in by 5 minutes on dalli key write to facilitate ↵ | Mike Evans | 2012-10-11 | 1 | -0/+4 |
| | |/ | |/| | | | | | | | :race_condition_ttl working correctly. | ||||
* | | | Cleanup trailing whitespaces | dfens | 2012-10-12 | 1 | -1/+1 |
| | | | |||||
* | | | adding a test for b21f24d9807bd161af947cf0f0cc440c9adffb73 | Aaron Patterson | 2012-10-11 | 1 | -0/+14 |
|/ / | |||||
* | | Ensure expires_in and created_at timestamps aren't nil when attempting to ↵ | Joshua Peek | 2012-10-10 | 1 | -1/+1 |
| | | | | | | | | upgrade cache | ||||
* | | let (array|hash)/conversions.rb load the extensions in ↵ | Xavier Noria | 2012-10-09 | 3 | -3/+5 |
| | | | | | | | | object/to_(param|query).rb | ||||
* | | adds a missing require | Xavier Noria | 2012-10-09 | 1 | -0/+1 |
| | | |||||
* | | adds missing require | Xavier Noria | 2012-10-09 | 1 | -0/+1 |
| | | |||||
* | | keys.include? -> key? | Xavier Noria | 2012-10-09 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #7817 from NARKOZ/object-conversions | Xavier Noria | 2012-10-09 | 4 | -11/+2 |
|\ \ | |/ |/| | remove unnecessary object/conversions file | ||||
| * | remove unnecessary object/conversions file | Nihad Abbasov | 2012-10-02 | 4 | -11/+2 |
| | | |||||
* | | explains why these requires are in an unusual place | Xavier Noria | 2012-10-07 | 1 | -0/+8 |
| | | |||||
* | | Merge pull request #7650 from kennyj/fix_warning_20120915 | Xavier Noria | 2012-10-07 | 1 | -6/+7 |
|\ \ | | | | | | | Fix warning: circular require considered harmful. | ||||
| * | | Fix warning: circular require considered harmful. | kennyj | 2012-10-03 | 1 | -6/+7 |
| |/ | |||||
* | | Ruby 2 compat. Hash[] now raises on bad elements rather than ignoring them. ↵ | Jeremy Kemper | 2012-10-06 | 1 | -1/+0 |
| | | | | | | | | No sense over-testing this MRI-specific behavior. See ruby/ruby@8d6add973ebcb3b4c1efbfaf07786550a3e219af | ||||
* | | rename private method to avoid overriding | Francesco Rodriguez | 2012-10-06 | 1 | -2/+2 |
| | | |||||
* | | use Rails backtrace in tests | Francesco Rodriguez | 2012-10-05 | 1 | -0/+1 |
| | |