diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-04-11 00:50:09 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-04-11 00:50:09 +0000 |
| commit | 33c2bbdda7f94789dc0455711093ee788c64a531 (patch) | |
| tree | caced55ea5ede3baa6e13cf15d8a869121dd3d4f /app/models/admin | |
| parent | 67e77f230e93b2e2ac05632a7cccdb5f26537f3b (diff) | |
| parent | d9b62e34da0c0238176f27557ac7b953da94df7e (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/models/admin')
| -rw-r--r-- | app/models/admin/action_log.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/models/admin/action_log.rb b/app/models/admin/action_log.rb index c437c8ee8..81f278e07 100644 --- a/app/models/admin/action_log.rb +++ b/app/models/admin/action_log.rb @@ -35,6 +35,11 @@ class Admin::ActionLog < ApplicationRecord self.recorded_changes = target.attributes when :update, :promote, :demote self.recorded_changes = target.previous_changes + when :change_email + self.recorded_changes = ActiveSupport::HashWithIndifferentAccess.new( + email: [target.email, nil], + unconfirmed_email: [nil, target.unconfirmed_email] + ) end end end |