Skip to content
Snippets Groups Projects
Commit b48c9013 authored by Eugen Rochko's avatar Eugen Rochko Committed by GitHub
Browse files

Bump version, improve how version is stored for better commit history (#2526)

parent b48f2cbc
No related branches found
No related tags found
No related merge requests found
# frozen_string_literal: true
module HttpHelper
USER_AGENT = "#{HTTP::Request::USER_AGENT} (Mastodon/#{Mastodon::VERSION}; +http://#{Rails.configuration.x.local_domain}/)"
USER_AGENT = "#{HTTP::Request::USER_AGENT} (Mastodon/#{Mastodon::Version}; +http://#{Rails.configuration.x.local_domain}/)"
def http_client(options = {})
timeout = { write: 10, connect: 10, read: 10 }.merge(options)
......
......@@ -27,6 +27,6 @@ class InstancePresenter
end
def version_number
Mastodon::VERSION
Mastodon::Version
end
end
......@@ -4,4 +4,4 @@ node(:uri) { site_hostname }
node(:title) { Setting.site_title }
node(:description) { Setting.site_description }
node(:email) { Setting.site_contact_email }
node(:version) { Mastodon::VERSION }
node(:version) { Mastodon::Version }
# frozen_string_literal: true
module Mastodon
VERSION = '1.2.2'
module Version
module_function
def major
1
end
def minor
3
end
def patch
0
end
def pre
nil
end
def to_a
[major, minor, patch, pre].compact
end
def to_s
to_a.join('.')
end
end
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment