mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-01-16 23:27:27 +01:00
Code Issues Projects Releases Wiki Activity

Use config_for for Mastodon::Version metadata/prerelease values (#33548)

Browse Source
This commit is contained in:
Matt Jankowski 2025-01-10 10:52:43 -05:00 committed by GitHub
parent 2cfc2a777a
commit 34cd7d6585
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/mastodon.yml
View File

@ -2,3 +2,6 @@
shared: shared:
self_destruct_value: <%= ENV.fetch('SELF_DESTRUCT', nil) %> self_destruct_value: <%= ENV.fetch('SELF_DESTRUCT', nil) %>
software_update_url: <%= ENV.fetch('UPDATE_CHECK_URL', 'https://api.joinmastodon.org/update-check') %> software_update_url: <%= ENV.fetch('UPDATE_CHECK_URL', 'https://api.joinmastodon.org/update-check') %>
version:
metadata: <%= ENV.fetch('MASTODON_VERSION_METADATA', nil) %>
prerelease: <%= ENV.fetch('MASTODON_VERSION_PRERELEASE', nil) %>

8
lib/mastodon/version.rb
View File

@ -21,11 +21,11 @@ module Mastodon
end end
def prerelease def prerelease
ENV['MASTODON_VERSION_PRERELEASE'].presence || default_prerelease version_configuration[:prerelease].presence || default_prerelease
end end
def build_metadata def build_metadata
ENV.fetch('MASTODON_VERSION_METADATA', nil) version_configuration[:metadata]
end end
def to_a def to_a
@ -77,5 +77,9 @@ module Mastodon
def user_agent def user_agent
@user_agent ||= "Mastodon/#{Version} (#{HTTP::Request::USER_AGENT}; +http#{Rails.configuration.x.use_https ? 's' : ''}://#{Rails.configuration.x.web_domain}/)" @user_agent ||= "Mastodon/#{Version} (#{HTTP::Request::USER_AGENT}; +http#{Rails.configuration.x.use_https ? 's' : ''}://#{Rails.configuration.x.web_domain}/)"
end end
def version_configuration
Rails.configuration.x.mastodon.version
end
end end
end end