76949bc007
Conflicts:
- Dockerfile
Took upstream version and reverted b6d0dcc5d3
.
Hopefuly it's not needed anymore.
- app/controllers/api/v1/search_controller.rb
The conflict was due to us raising the number of results returned.
Upstream raised it further, so took it.
- config/locales/de.yml
Took upstream changes to theme translation strings.
- config/locales/gl.yml
Took upstream changes to theme translation strings.
- config/locales/nl.yml
Took upstream changes to theme translation strings.
- config/locales/sk.yml
Took upstream changes to theme translation strings.
64 lines
963 B
Ruby
64 lines
963 B
Ruby
# frozen_string_literal: true
|
|
|
|
module Mastodon
|
|
module Version
|
|
module_function
|
|
|
|
def major
|
|
2
|
|
end
|
|
|
|
def minor
|
|
7
|
|
end
|
|
|
|
def patch
|
|
3
|
|
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
|
|
'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
|