Merge remote-tracking branch 'parent/main' into upstream-20231021

2023-10-21 10:32:06 +09:00 · 2023-10-21 10:32:06 +09:00 · f9eaaec4e7
commit f9eaaec4e7
parent d789304e19 ab0fb81479
95 changed files with 1002 additions and 657 deletions
--- a/app/serializers/rest/application_serializer.rb
+++ b/app/serializers/rest/application_serializer.rb
@ -1,7 +1,7 @@
 # frozen_string_literal: true

 class REST::ApplicationSerializer < ActiveModel::Serializer
-  attributes :id, :name, :website, :redirect_uri,
+  attributes :id, :name, :website, :scopes, :redirect_uri,
             :client_id, :client_secret, :vapid_key

  def id