mastodon/app/models/concerns
Thibaut Girka 45fce0e496 Merge branch 'master' into glitch-soc/merge
Conflicts:
	app/controllers/invites_controller.rb
	app/serializers/initial_state_serializer.rb
	config/locales/ko.yml
2018-05-11 18:12:42 +02: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 'origin/master' into gs-master 2018-05-04 14:16:30 -05: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 Catch Paperclip processing failures (fixes #6378) (#7439) 2018-05-11 13:14:50 +02:00
status_threading_concern.rb Fix n+1 queries in StatusThreadingConcern (#7321) 2018-05-03 10:41:58 +02:00
streamable.rb Define instance method outside #included (#3128) 2017-05-19 11:41:45 +02:00