FEATURE: Log user merge in staff logs

This commit is contained in:
Gerhard Schlager
2018-06-08 16:48:26 +02:00
parent bfa0f71e2b
commit 150ae21489
6 changed files with 38 additions and 4 deletions

View File

@@ -80,7 +80,8 @@ class UserHistory < ActiveRecord::Base
removed_suspend_user: 61,
removed_unsilence_user: 62,
removed_unsuspend_user: 63,
post_rejected: 64
post_rejected: 64,
merge_user: 65
)
end
@@ -139,7 +140,8 @@ class UserHistory < ActiveRecord::Base
:create_badge,
:change_badge,
:delete_badge,
:post_rejected
:post_rejected,
:merge_user
]
end