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
account_finder_concern.rb
account_header.rb
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
paginable.rb
relationship_cacheable.rb
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