aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-10-28 09:53:29 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-10-28 09:53:29 -0700
commite46a8d89baa5b58f19cd84cf9a57beb4507e7d9c (patch)
tree95af0726a1f39f7a30bf2e8e4819fe044068e024 /activerecord/lib
parent94aadf76806c3f34d2ccb9980cbeb59809e799b0 (diff)
parent0fbdddd7158bd951d2672fc8ebc614c42906815f (diff)
downloadrails-e46a8d89baa5b58f19cd84cf9a57beb4507e7d9c.tar.gz
rails-e46a8d89baa5b58f19cd84cf9a57beb4507e7d9c.tar.bz2
rails-e46a8d89baa5b58f19cd84cf9a57beb4507e7d9c.zip
Merge pull request #8052 from schneems/schneems/silence-ar-query-in-middleware
Don't log on pending migration check
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/migration.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index d5ee98382d..5c5417a0e1 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -342,7 +342,9 @@ module ActiveRecord
end
def call(env)
- ActiveRecord::Migration.check_pending!
+ ActiveRecord::Base.logger.quietly do
+ ActiveRecord::Migration.check_pending!
+ end
@app.call(env)
end
end