David Yip 8142bd2553 Merge remote-tracking branch 'tootsuite/master' into merge-upstream ...

Conflicts:
 	app/models/status.rb

The conflict in the Status model was due to
https://github.com/tootsuite/mastodon/commit/5bf500338478f819a65d25636a0af61a482972d3.
It was resolved by accepting tootsuite's changes.

2018-06-07 05:13:49 -05:00

..

account_avatar.rb

Validate HTTP response length while receiving (#6891)

2018-03-26 14:02:10 +02:00

account_finder_concern.rb

Fix UniqueUsernameValidator comparison (#6926)

2018-03-27 04:33:57 +02:00

account_header.rb

Validate HTTP response length while receiving (#6891)

2018-03-26 14:02:10 +02:00

account_interactions.rb

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

2018-05-31 01:17:25 +00:00

attachmentable.rb

Detect and prevent image bombs, max. processable dimension 4096^2 (#7229)

2018-04-23 09:16:38 +02:00

cacheable.rb

Fix cache_associated no longer working (#7320)

2018-05-03 10:41:41 +02:00

omniauthable.rb

Add additional first_name and last_name SAML attribute statement options, and modify Omniauthable concern to use full_name or first_name + last_name if not available (#6669)

2018-03-07 06:19:10 +01:00

paginable.rb

Fix prev/next links on public profile page (#6497)

2018-02-26 03:31:28 +01:00

relationship_cacheable.rb

Cache relationships in API (#6482)

2018-02-18 03:14:46 +01:00

remotable.rb

Fix fetch of remote image with multiple Content-Type headers (#7749)

2018-06-06 20:50:07 +02:00

status_threading_concern.rb

Fix context performance by partially reverting #7083 (#7734)

2018-06-04 22:20:12 +02:00

streamable.rb

…