From 37b726982d0cc8af21705f6acf1a76f3a0f4a6a1 Mon Sep 17 00:00:00 2001 From: Blake Erickson Date: Sun, 22 Jul 2018 16:08:36 -0600 Subject: [PATCH] Fix silence and unsilenced response bodies Both response bodies had a typo that included suspended_at, so I renamed it to silenced_at. --- app/controllers/admin/users_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 909126891de..e73015e67cd 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -350,7 +350,7 @@ class Admin::UsersController < Admin::AdminController silenced: true, silence_reason: silencer.user_history.try(:details), silenced_till: @user.silenced_till, - suspended_at: @user.silenced_at, + silenced_at: @user.silenced_at, silenced_by: BasicUserSerializer.new(current_user, root: false).as_json } ) @@ -365,7 +365,7 @@ class Admin::UsersController < Admin::AdminController silenced: false, silence_reason: nil, silenced_till: nil, - suspended_at: nil + silenced_at: nil } ) end