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.

Thibaut Girka 478abe3a58 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).		6 years ago
..
account_avatar.rb	Validate HTTP response length while receiving (#6891)	7 years ago
account_counters.rb	Extract counters from accounts table to account_stats table (#9295)	6 years ago
account_finder_concern.rb	Fix UniqueUsernameValidator comparison (#6926)	7 years ago
account_header.rb	Redesign public profiles and toots (#8068)	6 years ago
account_interactions.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
attachmentable.rb	Restore support to ruby 2.3, add ruby 2.3 to circle ci (#7935)	6 years ago
cacheable.rb	Fix cache_associated no longer working (#7320)	7 years ago
expireable.rb	Fix low-hanging rubocop gripes (#8458)	6 years ago
omniauthable.rb	rubocop issues - Cleaning up (#8912)	6 years ago
paginable.rb	Fix timeline pagination (#8827)	6 years ago
relationship_cacheable.rb	Cache relationships in API (#6482)	7 years ago
remotable.rb	Fix nil host in remotable (#8508)	6 years ago
status_threading_concern.rb	Sort self-replies to the top of descendants (#9320)	6 years ago
streamable.rb	Define instance method outside #included (#3128)	8 years ago