Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-05-18 00:17:23 +00:00
parent 2636a23092 919eef3098
commit 4c0770d6c8
3 changed files with 7 additions and 6 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@ -48,5 +48,9 @@ module Mastodon
        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