mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2025-01-19 00:24:05 +01:00
ab152ebed4
Conflicts: - `app/models/status.rb`: Upstream refactored `visibility` handling to a concern, while glitch-soc had custom code adjacent to some of the changed lines. Applied upstream's changes. - `lib/mastodon/version.rb`: Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's default github repository had been modified. Applied upstream's changes and updated `config/mastodon.yml` accordingly.
11 lines
547 B
YAML
11 lines
547 B
YAML
---
|
|
shared:
|
|
self_destruct_value: <%= ENV.fetch('SELF_DESTRUCT', nil) %>
|
|
software_update_url: <%= ENV.fetch('UPDATE_CHECK_URL', 'https://api.joinmastodon.org/update-check') %>
|
|
source:
|
|
base_url: <%= ENV.fetch('SOURCE_BASE_URL', nil) %>
|
|
repository: <%= ENV.fetch('GITHUB_REPOSITORY', 'glitch-soc/mastodon') %>
|
|
tag: <%= ENV.fetch('SOURCE_TAG', nil) %>
|
|
version:
|
|
metadata: <%= ['glitch', ENV.fetch('MASTODON_VERSION_METADATA', nil)].compact_blank.join('.') %>
|
|
prerelease: <%= ENV.fetch('MASTODON_VERSION_PRERELEASE', nil) %>
|