You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Yip 087c79669a Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb db/schema.rb		7 years ago
..
account_avatar.rb	Validate HTTP response length while receiving (#6891)	7 years ago
account_finder_concern.rb	Fix UniqueUsernameValidator comparison (#6926)	7 years ago
account_header.rb	Validate HTTP response length while receiving (#6891)	7 years ago
account_interactions.rb	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
attachmentable.rb	Detect and prevent image bombs, max. processable dimension 4096^2 (#7229)	7 years ago
cacheable.rb	Fix cache_associated no longer working (#7320)	7 years ago
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)	7 years ago
paginable.rb	Fix prev/next links on public profile page (#6497)	7 years ago
relationship_cacheable.rb	Cache relationships in API (#6482)	7 years ago
remotable.rb	Rescue Mastodon::LengthValidationError in Remoteable (#7228)	7 years ago
status_threading_concern.rb	Fix n+1 queries in StatusThreadingConcern (#7321)	7 years ago
streamable.rb	Define instance method outside #included (#3128)	8 years ago