aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-06-04 01:33:03 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-06-04 01:33:03 -0300
commitba37d5da060a71aebb9c8ba63e879360ed2023ab (patch)
tree8c42d15fe11ef5d1c8e260810162fa0aff111a08 /activerecord/lib
parentae5f2b4e79f3e41aad8280109d8bfc788a1a2733 (diff)
parentac002395d87aa7a4bcc3126e67ca3b2808d832a6 (diff)
downloadrails-ba37d5da060a71aebb9c8ba63e879360ed2023ab.tar.gz
rails-ba37d5da060a71aebb9c8ba63e879360ed2023ab.tar.bz2
rails-ba37d5da060a71aebb9c8ba63e879360ed2023ab.zip
Merge pull request #20430 from georgeclaghorn/tighten-up-suppression
Apply Active Record suppression to all saves
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/suppressor.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/suppressor.rb b/activerecord/lib/active_record/suppressor.rb
index b0b86865fd..b3644bf569 100644
--- a/activerecord/lib/active_record/suppressor.rb
+++ b/activerecord/lib/active_record/suppressor.rb
@@ -37,8 +37,7 @@ module ActiveRecord
end
end
- # Ignore saving events if we're in suppression mode.
- def save!(*args) # :nodoc:
+ def create_or_update(*args) # :nodoc:
SuppressorRegistry.suppressed[self.class.name] ? true : super
end
end