diff options
| author | kibigo! <marrus-sh@users.noreply.github.com> | 2017-07-15 14:33:15 -0700 |
|---|---|---|
| committer | kibigo! <marrus-sh@users.noreply.github.com> | 2017-07-15 14:33:15 -0700 |
| commit | 09cfc079b0958c42fe619e2d88c3f9fd1d7c7900 (patch) | |
| tree | 156de790a5bec0fdf050e392bee8a64b220d3a9d /app/helpers/http_helper.rb | |
| parent | 08d021916db9e350259b925d7e562aa13ba37422 (diff) | |
| parent | 695439775eacea081c7257aabab39d0ec6b492dc (diff) | |
Merge upstream (#81)
Diffstat (limited to 'app/helpers/http_helper.rb')
| -rw-r--r-- | app/helpers/http_helper.rb | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/app/helpers/http_helper.rb b/app/helpers/http_helper.rb deleted file mode 100644 index e39a52da0..000000000 --- a/app/helpers/http_helper.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -module HttpHelper - def http_client(options = {}) - timeout = { write: 10, connect: 10, read: 10 }.merge(options) - - HTTP.headers(user_agent: user_agent) - .timeout(:per_operation, timeout) - .follow - end - - private - - def user_agent - @user_agent ||= "#{HTTP::Request::USER_AGENT} (Mastodon/#{Mastodon::Version}; +http://#{Rails.configuration.x.local_domain}/)" - end -end |