diff options
| author | beatrix <beatrix.bitrot@gmail.com> | 2017-07-20 11:24:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-20 11:24:32 -0400 |
| commit | e7edb4d1eeba6c12a1c71271faa30d2bbf00d054 (patch) | |
| tree | f373d05c4ea43bd335910f3603fab3d866a2486e /app/controllers/api | |
| parent | d2352246920800e491466d84b0146feb4d1d791f (diff) | |
| parent | 1fcdaafa6fbe6d746a096c33263d76e6819da46d (diff) | |
Merge pull request #87 from tootsuite/master
merge upstream
Diffstat (limited to 'app/controllers/api')
| -rw-r--r-- | app/controllers/api/base_controller.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb index c1b2ec3cf..105a2859d 100644 --- a/app/controllers/api/base_controller.rb +++ b/app/controllers/api/base_controller.rb @@ -17,11 +17,7 @@ class Api::BaseController < ApplicationController render json: { error: 'Record not found' }, status: 404 end - rescue_from Goldfinger::Error do - render json: { error: 'Remote account could not be resolved' }, status: 422 - end - - rescue_from HTTP::Error do + rescue_from HTTP::Error, Mastodon::UnexpectedResponseError do render json: { error: 'Remote data could not be fetched' }, status: 503 end |