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 a2a64ecd3e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.		6 years ago
..
account_associations.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
account_avatar.rb	Validate HTTP response length while receiving (#6891)	7 years ago
account_counters.rb	Add profile directory (#9427)	6 years ago
account_finder_concern.rb	Use Contact User as Relay, Report, Subscribe. (#9661)	6 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
domain_normalizable.rb	Create DomainNormalizable#normalize_domain (#9631)	6 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	…
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	…