diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-08-12 11:10:42 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-08-12 11:10:42 -0300 |
| commit | a2400308eab88b5eff27e05d1f7624345fb33b54 (patch) | |
| tree | 38630de37ac59c50061734d9f353ebb798ba2023 /activerecord/test/cases/attribute_decorators_test.rb | |
| parent | 045d7173167043389dbe8bd961425c1b1cc86d48 (diff) | |
| parent | 82e28492e7c581cdeea904464a18eb11118f4ac0 (diff) | |
| download | rails-a2400308eab88b5eff27e05d1f7624345fb33b54.tar.gz rails-a2400308eab88b5eff27e05d1f7624345fb33b54.tar.bz2 rails-a2400308eab88b5eff27e05d1f7624345fb33b54.zip | |
Merge branch 'master' into loofah
Conflicts:
actionpack/CHANGELOG.md
actionpack/test/controller/integration_test.rb
actionview/CHANGELOG.md
Diffstat (limited to 'activerecord/test/cases/attribute_decorators_test.rb')
| -rw-r--r-- | activerecord/test/cases/attribute_decorators_test.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activerecord/test/cases/attribute_decorators_test.rb b/activerecord/test/cases/attribute_decorators_test.rb index b352d1a6c2..cbc2c4e5d7 100644 --- a/activerecord/test/cases/attribute_decorators_test.rb +++ b/activerecord/test/cases/attribute_decorators_test.rb @@ -45,7 +45,6 @@ module ActiveRecord test "decoration does not eagerly load existing columns" do assert_no_queries do - Model.reset_column_information Model.decorate_attribute_type(:a_string, :test) { |t| StringDecorator.new(t) } end end |