tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Eugen Rochko
2017-04-27 15:22:19 +02:00
committed by GitHub
parent b48f2cbc8b
commit b48c9013aa
4 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/http_helper.rb
View File

@ -1,7 +1,7 @@
# 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)

2
app/presenters/instance_presenter.rb
View File

@ -27,6 +27,6 @@ class InstancePresenter
end
def version_number
Mastodon::VERSION
Mastodon::Version
end
end

2
app/views/api/v1/instances/show.rabl
View File

@ -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 }