diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-07-22 13:38:17 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-22 13:38:17 +0200 |
commit | b9f351d8455f672137a34ea0ea0b1050fba3464b (patch) | |
tree | 4a2dd275ddecf46760ccb8140fac5f6cb21ac766 /app/services | |
parent | 801e546ecc1efb4103232d8265229eb455a8dd5b (diff) | |
parent | 5d9acc0ce41aa0274fef2dd321a8fad1fb0665ea (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/mastodon/actions/compose.js`: Not a “real” conflict, but change too close to a change we made to fix the vanilla WebUI locally pushing authored local-only toots in the public TL view.
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/update_account_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/update_account_service.rb b/app/services/update_account_service.rb index 4172d5774..666db5c71 100644 --- a/app/services/update_account_service.rb +++ b/app/services/update_account_service.rb @@ -12,7 +12,7 @@ class UpdateAccountService < BaseService check_links(account) process_hashtags(account) end - rescue Mastodon::DimensionsValidationError => de + rescue Mastodon::DimensionsValidationError, Mastodon::StreamValidationError => de account.errors.add(:avatar, de.message) false end |