diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-27 15:22:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-27 15:22:19 +0200 |
| commit | b48c9013aa790b28e3427257e0e62f419bce2ddc (patch) | |
| tree | b56b0c9ec6516075216ceea8070edee49faec3e0 /app | |
| parent | b48f2cbc8b6b260a8d9b51a26e484a7da1694851 (diff) | |
Bump version, improve how version is stored for better commit history (#2526)
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/http_helper.rb | 2 | ||||
| -rw-r--r-- | app/presenters/instance_presenter.rb | 2 | ||||
| -rw-r--r-- | app/views/api/v1/instances/show.rabl | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/http_helper.rb b/app/helpers/http_helper.rb index 1e1ac8256..1697de746 100644 --- a/app/helpers/http_helper.rb +++ b/app/helpers/http_helper.rb @@ -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) diff --git a/app/presenters/instance_presenter.rb b/app/presenters/instance_presenter.rb index e583a38d0..9a69809d0 100644 --- a/app/presenters/instance_presenter.rb +++ b/app/presenters/instance_presenter.rb @@ -27,6 +27,6 @@ class InstancePresenter end def version_number - Mastodon::VERSION + Mastodon::Version end end diff --git a/app/views/api/v1/instances/show.rabl b/app/views/api/v1/instances/show.rabl index e1d4700a0..8ab3fe0ca 100644 --- a/app/views/api/v1/instances/show.rabl +++ b/app/views/api/v1/instances/show.rabl @@ -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 } |