mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-25 01:24:02 -05:00
bf3cb42da7
Cherry-picked d2528b26b6
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
Upstream changed stuff, we had extra attributes.
Applied upstream changes while keeping our extra attributes.
- `app/serializers/rest/instance_serializer.rb`:
Upstream actually moved that to `app/serializers/rest/v1/instance_serializer.rb`,
so updated that file by keeping our extra attributes, and took upstream's
version of `app/serializers/rest/instance_serializer.rb`.
- `spec/views/about/show.html.haml_spec.rb`:
Took upstream's version.
12 lines
375 B
Ruby
12 lines
375 B
Ruby
# frozen_string_literal: true
|
|
|
|
class Api::V1::InstancesController < Api::BaseController
|
|
skip_before_action :set_cache_headers
|
|
skip_before_action :require_authenticated_user!, unless: :whitelist_mode?
|
|
|
|
def show
|
|
expires_in 3.minutes, public: true
|
|
render_with_cache json: InstancePresenter.new, serializer: REST::V1::InstanceSerializer, root: 'instance'
|
|
end
|
|
end
|