mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-10-23 02:27:34 +02: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.
10 lines
259 B
Plaintext
10 lines
259 B
Plaintext
- content_for :page_title do
|
|
= t('terms.title', instance: site_hostname)
|
|
|
|
.grid
|
|
.column-0
|
|
.box-widget
|
|
.rich-formatting= @instance_presenter.privacy_policy.html_safe.presence || t('terms.body_html')
|
|
.column-1
|
|
= render 'application/sidebar'
|