diff options
| author | kibigo! <marrus-sh@users.noreply.github.com> | 2017-07-12 02:03:17 -0700 |
|---|---|---|
| committer | kibigo! <marrus-sh@users.noreply.github.com> | 2017-07-12 02:03:17 -0700 |
| commit | 79d898ae0ad8c0e66bd63ec3e0904e9e5e7894e8 (patch) | |
| tree | ee8d832ed2f11e9afe62daf0e586a86004eb8d98 /app/controllers/api/v1/statuses/mutes_controller.rb | |
| parent | bcf7ee48e94cd2e4d2de28e8854e7f0e2b5cad1f (diff) | |
| parent | 056b5ed72f6d980bceeb49eb249b8365fe8fce66 (diff) | |
Merge upstream!! #64 <3 <3
Diffstat (limited to 'app/controllers/api/v1/statuses/mutes_controller.rb')
| -rw-r--r-- | app/controllers/api/v1/statuses/mutes_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/api/v1/statuses/mutes_controller.rb b/app/controllers/api/v1/statuses/mutes_controller.rb index eab88f2ef..a4bf0acdd 100644 --- a/app/controllers/api/v1/statuses/mutes_controller.rb +++ b/app/controllers/api/v1/statuses/mutes_controller.rb @@ -14,14 +14,14 @@ class Api::V1::Statuses::MutesController < Api::BaseController current_account.mute_conversation!(@conversation) @mutes_map = { @conversation.id => true } - render 'api/v1/statuses/show' + render json: @status, serializer: REST::StatusSerializer end def destroy current_account.unmute_conversation!(@conversation) @mutes_map = { @conversation.id => false } - render 'api/v1/statuses/show' + render json: @status, serializer: REST::StatusSerializer end private |