a9eaa780f5
Conflicts: - app/javascript/mastodon/features/compose/components/compose_form.js Upstream cleaned up a bit, including on lines in which we replaced the hardcoded 500 character limit with a maxChar constant. Applied the changes while keeping maxChar instead of 500. - app/javascript/packs/public.js Moved upstream's new animated avatar hover handling in app/javascript/core/public.js - app/javascript/styles/fonts/montserrat.scss Upstream fixed local font name, applied those changes. - app/javascript/styles/fonts/roboto.scss Upstream fixed local font name, applied those changes. - lib/mastodon/version.rb Upstream made repo URL configurable, did the same, but default to glitch-soc
64 lines
1 KiB
Ruby
64 lines
1 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
module Mastodon
|
|
module Version
|
|
module_function
|
|
|
|
def major
|
|
2
|
|
end
|
|
|
|
def minor
|
|
8
|
|
end
|
|
|
|
def patch
|
|
0
|
|
end
|
|
|
|
def pre
|
|
nil
|
|
end
|
|
|
|
def flags
|
|
''
|
|
end
|
|
|
|
def to_a
|
|
[major, minor, patch, pre].compact
|
|
end
|
|
|
|
def suffix
|
|
'+glitch'
|
|
end
|
|
|
|
def to_s
|
|
[to_a.join('.'), flags, suffix].join
|
|
end
|
|
|
|
def repository
|
|
ENV.fetch('GITHUB_REPOSITORY') { 'glitch-soc/mastodon' }
|
|
end
|
|
|
|
def source_base_url
|
|
ENV.fetch('SOURCE_BASE_URL') { "https://github.com/#{repository}" }
|
|
end
|
|
|
|
# specify git tag or commit hash here
|
|
def source_tag
|
|
nil
|
|
end
|
|
|
|
def source_url
|
|
if source_tag
|
|
"#{source_base_url}/tree/#{source_tag}"
|
|
else
|
|
source_base_url
|
|
end
|
|
end
|
|
|
|
def user_agent
|
|
@user_agent ||= "#{HTTP::Request::USER_AGENT} (Mastodon/#{Version}; +http#{Rails.configuration.x.use_https ? 's' : ''}://#{Rails.configuration.x.web_domain}/)"
|
|
end
|
|
end
|
|
end
|