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

2018-01-24 19:17:11 +00:00
parent 1b4d79acf8 a3c0a20373
commit 0e10667fbe
91 changed files with 728 additions and 238 deletions
--- a/app/controllers/authorize_follows_controller.rb
+++ b/app/controllers/authorize_follows_controller.rb
@@ -46,7 +46,7 @@ class AuthorizeFollowsController < ApplicationController
  end

  def account_from_remote_follow
-    ResolveRemoteAccountService.new.call(acct_without_prefix)
+    ResolveAccountService.new.call(acct_without_prefix)
  end

  def acct_param_is_url?