aaa9ec340b
Conflicts: - `app/lib/formatter.rb`: Upstream completely refactored the formatting code and removed that file, while glitch-soc had code for Markdown and HTML toots. Took upstream code, glitch-soc changes will be re-implemented on top of the refactored classes in a later commit. - `app/models/status.rb`: Upstream refactored status edit handling and moved code to `app/models/concerns/status_snapshot_concern.rb`. Applied glitch-soc's changes to that file. - `app/serializers/activitypub/note_serializer.rb`: Not really a conflict, just a line added too close to one modified by glitch-soc. Applied upstream changes while keeping the glitch-soc-modified one. - `app/services/update_status_service.rb`: Not really a conflict, upstream modified a line adjacent to one added by glitch-soc. Applied upstream changes while keeping the glitch-soc line. - `app/views/statuses/_simple_status.html.haml`: Upstream refactored formatting, glitch-soc changed the markup slightly. Applied upstream changes. - `spec/lib/formatter_spec.rb`: Upstream completely refactored the formatting code and removed that file, while glitch-soc had code for Markdown and HTML toots. Took upstream code, glitch-soc changes will be re-implemented on top of the refactored classes in a later commit.
61 lines
1017 B
Ruby
61 lines
1017 B
Ruby
# frozen_string_literal: true
|
|
|
|
module Mastodon
|
|
module Version
|
|
module_function
|
|
|
|
def major
|
|
3
|
|
end
|
|
|
|
def minor
|
|
5
|
|
end
|
|
|
|
def patch
|
|
0
|
|
end
|
|
|
|
def flags
|
|
'rc3'
|
|
end
|
|
|
|
def suffix
|
|
'+glitch'
|
|
end
|
|
|
|
def to_a
|
|
[major, minor, patch].compact
|
|
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
|
|
ENV.fetch('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
|