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 d392020da6 Merge branch 'master' into glitch-soc/tentative-merge ... Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.		6 years ago
..
account_avatar.rb	…
account_finder_concern.rb	…
account_header.rb	…
account_interactions.rb	Merge branch 'master' into glitch-soc/tentative-merge	6 years ago
attachmentable.rb	Restore support to ruby 2.3, add ruby 2.3 to circle ci (#7935)	6 years ago
cacheable.rb	…
expireable.rb	Keyword/phrase filtering (#7905)	6 years ago
omniauthable.rb	…
paginable.rb	…
relationship_cacheable.rb	…
remotable.rb	Fix fetch of remote image with multiple Content-Type headers (#7749)	7 years ago
status_threading_concern.rb	Fix context performance by partially reverting #7083 (#7734)	7 years ago
streamable.rb	…