Merge commit '15fd712464' into kb_migration

2023-05-01 15:05:34 +09:00 · 2023-05-01 15:05:34 +09:00 · 3a1a6ba39e
commit 3a1a6ba39e
parent 560ac47e55 15fd712464
289 changed files with 1339 additions and 1337 deletions
--- a/app/controllers/api/v1/lists_controller.rb
+++ b/app/controllers/api/v1/lists_controller.rb
@ -32,6 +32,7 @@ class Api::V1::ListsController < Api::BaseController

  def destroy
    raise Mastodon::ValidationError, I18n.t('antennas.errors.remove_list_with_antenna') if Antenna.where(list_id: @list.id).any?
+
    @list.destroy!
    render_empty
  end