5bb8563f6c
Conflicts: - app/controllers/admin/base_controller.rb - app/controllers/filters_controller.rb - app/controllers/invites_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/javascript/packs/public.js - app/views/settings/profiles/show.html.haml Conflicts were mostly due to the addition of body classes to the settings page, this was caused by rejecting upstream changes for most of those files and modifying Settings::BaseController instead. Another cause of conflicts was the deletion of client-side checking of display name / bio length, this was modified in app/javascript/core/settings.js instead.
64 lines
966 B
Ruby
64 lines
966 B
Ruby
# frozen_string_literal: true
|
|
|
|
module Mastodon
|
|
module Version
|
|
module_function
|
|
|
|
def major
|
|
2
|
|
end
|
|
|
|
def minor
|
|
6
|
|
end
|
|
|
|
def patch
|
|
0
|
|
end
|
|
|
|
def pre
|
|
nil
|
|
end
|
|
|
|
def flags
|
|
'rc2'
|
|
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
|
|
'glitch-soc/mastodon'
|
|
end
|
|
|
|
def 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
|