You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/app/models/concerns
Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb
8 years ago
..
account_avatar.rb Validate HTTP response length while receiving (#6891) 8 years ago
account_finder_concern.rb Fix UniqueUsernameValidator comparison (#6926) 8 years ago
account_header.rb Redesign public profiles and toots (#8068) 8 years ago
account_interactions.rb Merge branch 'master' into glitch-soc/merge-upstream 8 years ago
attachmentable.rb Restore support to ruby 2.3, add ruby 2.3 to circle ci (#7935) 8 years ago
cacheable.rb Fix cache_associated no longer working (#7320) 8 years ago
expireable.rb Fix low-hanging rubocop gripes (#8458) 8 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) 8 years ago
paginable.rb Fix timeline pagination (#8827) 8 years ago
relationship_cacheable.rb
remotable.rb Fix nil host in remotable (#8508) 8 years ago
status_threading_concern.rb Fix context performance by partially reverting #7083 (#7734) 8 years ago
streamable.rb