Fix #1426 - Trim long usernames in public follower/following lists #2993
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix #2221 - Catch OpenSSL exceptions when loading remote avatars/headers/attachments Don't strip "rel" attribute from <a> tags when sanitizing (microformats)
mjankowski
reviewed
May 11, 2017
| @@ -34,7 +34,7 @@ def avatar_remote_url=(url) | |||
|
|
|||
| self.avatar = URI.parse(parsed_url.to_s) | |||
| self[:avatar_remote_url] = url | |||
| rescue OpenURI::HTTPError => e | |||
| rescue OpenURI::HTTPError, OpenSSL::SSL::SSLError, Paperclip::Errors::NotIdentifiedByImageMagickError => e | |||
There was a problem hiding this comment.
This PR fixes two issues.
There was a problem hiding this comment.
I'd put those into separate commits.
I'll approve this PR, can you can decide to split it up or not.
mjankowski
approved these changes
May 11, 2017
| @@ -34,7 +34,7 @@ def avatar_remote_url=(url) | |||
|
|
|||
| self.avatar = URI.parse(parsed_url.to_s) | |||
| self[:avatar_remote_url] = url | |||
| rescue OpenURI::HTTPError => e | |||
| rescue OpenURI::HTTPError, OpenSSL::SSL::SSLError, Paperclip::Errors::NotIdentifiedByImageMagickError => e | |||
There was a problem hiding this comment.
I'd put those into separate commits.
I'll approve this PR, can you can decide to split it up or not.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #2221 - Catch OpenSSL exceptions when loading remote avatars/headers/attachments
Don't strip "rel" attribute from
<a>tags when sanitizing (microformats)