Merge branch 'kb_development' into kb_migration

app/controllers/api/v1/accounts/antennas_controller.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class Api::V1::Accounts::AntennasController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:lists' }
+  before_action :require_user!
+  before_action :set_account
+
+  def index
+    @antennas = @account.suspended? ? [] : @account.joined_antennas.where(account: current_account)
+    render json: @antennas, each_serializer: REST::AntennaSerializer
+  end
+
+  private
+
+  def set_account
+    @account = Account.find(params[:account_id])
+  end
+end

app/controllers/api/v1/accounts/credentials_controller.rb

@@ -30,6 +30,7 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController
       :bot,
       :discoverable,
       :searchability,
+      :dissubscribable,
       :hide_collections,
       fields_attributes: [:name, :value]
     )