mastodon/app/models/concerns
David Yip c816701550
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
 	.travis.yml
 	Gemfile.lock
 	README.md
 	app/controllers/settings/follower_domains_controller.rb
 	app/controllers/statuses_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/lib/feed_manager.rb
 	app/models/media_attachment.rb
 	app/models/mute.rb
 	app/models/status.rb
 	app/services/mute_service.rb
 	app/views/home/index.html.haml
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/ca.yml
 	config/locales/en.yml
 	config/locales/es.yml
 	config/locales/fr.yml
 	config/locales/nl.yml
 	config/locales/pl.yml
 	config/locales/pt-BR.yml
 	config/themes.yml
2018-05-03 17:23:44 -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 'origin/master' into gs-master 2018-05-03 17:23:44 -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 Rescue Mastodon::LengthValidationError in Remoteable (#7228) 2018-04-22 15:42:00 +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