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 34b8346e7f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb		6 years ago
..
controllers	Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream	6 years ago
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
features	rubocop issues - Cleaning up (#8912)	6 years ago
fixtures	Export and import show_reblogs together with following list (#10495)	6 years ago
helpers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
lib	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mailers	Add invite request to pending account notification e-mail (#10528)	6 years ago
models	Update remote bio test from 160 to 500 (#10799)	6 years ago
policies	…
presenters	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
requests	…
routing	Move create/destroy actions for api/v1/statuses to namespace (#3678)	8 years ago
serializers/activitypub	…
services	Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream	6 years ago
support	…
validators	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
views	…
workers	…
rails_helper.rb	…
spec_helper.rb	…