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 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/status.rb db/migrate/20180528141303_fix_accounts_unique_index.rb db/schema.rb Resolved by taking upstream changes (no real conflicts, just glitch-soc specific code too close to actual changes).		6 years ago
..
controllers	Update Rails (#8141)	6 years ago
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
features	…
fixtures	…
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	…
models	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
policies	Add test to disallow remote users from fetching local-only toots	6 years ago
presenters	…
requests	…
routing	…
services	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
support	…
validators	…
views	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
workers	…
rails_helper.rb	…
spec_helper.rb	…