Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/auth/setup_controller.rb`: Upstream removed a method close to a glitch-soc theming-related method. Removed the method like upstream did.
This commit is contained in:
9
app/serializers/rest/admin/trends/link_serializer.rb
Normal file
9
app/serializers/rest/admin/trends/link_serializer.rb
Normal file
@@ -0,0 +1,9 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class REST::Admin::Trends::LinkSerializer < REST::Trends::LinkSerializer
|
||||
attributes :id, :requires_review
|
||||
|
||||
def requires_review
|
||||
object.requires_review?
|
||||
end
|
||||
end
|
@@ -0,0 +1,10 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class REST::Admin::Trends::Links::PreviewCardProviderSerializer < ActiveModel::Serializer
|
||||
attributes :id, :domain, :trendable, :reviewed_at,
|
||||
:requested_review_at, :requires_review
|
||||
|
||||
def requires_review
|
||||
object.requires_review?
|
||||
end
|
||||
end
|
9
app/serializers/rest/admin/trends/status_serializer.rb
Normal file
9
app/serializers/rest/admin/trends/status_serializer.rb
Normal file
@@ -0,0 +1,9 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class REST::Admin::Trends::StatusSerializer < REST::StatusSerializer
|
||||
attributes :requires_review
|
||||
|
||||
def requires_review
|
||||
object.requires_review?
|
||||
end
|
||||
end
|
Reference in New Issue
Block a user