Fix broken merge

This commit is contained in:
Sam 2014-06-17 10:58:21 +10:00
parent 56dcd00570
commit 68343c74c4

View file

@ -50,7 +50,7 @@ class Promotion
admin = opts && opts[:log_action_for] admin = opts && opts[:log_action_for]
@user.trust_level = new_level @user.trust_level = new_level
@user.bio_raw_will_change! # So it can get re-cooked based on the new trust level @user.user_profile.bio_raw_will_change! # So it can get re-cooked based on the new trust level
@user.transaction do @user.transaction do
if admin if admin