diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2015-06-07 21:10:20 -0600 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-06-07 21:10:20 -0600 |
| commit | dc245c0ef57c65750caab2dbb4a6801178afad82 (patch) | |
| tree | a66e349697fd2e66126a8b409ea6998983181850 /activerecord | |
| parent | 8fea749e2cabc9f44e0d0d10ba71c1770e834081 (diff) | |
| parent | 9a35c484cbe9ffeaa4749de6c42dff1e233384e3 (diff) | |
| download | rails-dc245c0ef57c65750caab2dbb4a6801178afad82.tar.gz rails-dc245c0ef57c65750caab2dbb4a6801178afad82.tar.bz2 rails-dc245c0ef57c65750caab2dbb4a6801178afad82.zip | |
Merge pull request #20460 from mtsmfm/stop-to-s-for-fixture-timestamps
Stop `to_s(:db)` for fixture's timestamp
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/fixtures.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index 1ec8f818cd..7760fd33b7 100644 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -615,7 +615,6 @@ module ActiveRecord # a list of rows to insert to that table. def table_rows now = config.default_timezone == :utc ? Time.now.utc : Time.now - now = now.to_s(:db) # allow a standard key to be used for doing defaults in YAML fixtures.delete('DEFAULTS') |