Claire d8fdbb054e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/validators/status_length_validator.rb`: Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real conflict. Applied upstream changes. - `package.json`: glitch-soc-only dependency textually too close to a dependency updated upstream, not a real conflict. Applied upstream changes.		2021-03-02 12:06:58 +01:00
..
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2021-03-02 12:06:58 +01:00
fabricators	Add server rules (#15769)	2021-02-21 19:50:12 +01:00
features
fixtures	Add import/export feature for bookmarks (#14956)	2020-11-19 17:48:13 +01:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00
lib	Merge branch 'main' into glitch-soc/merge-upstream	2021-03-02 12:06:58 +01:00
mailers
models	Merge branch 'main' into glitch-soc/merge-upstream	2021-02-22 15:23:46 +01:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-08 14:20:35 +01:00
presenters
requests
routing
serializers/activitypub
services	Merge branch 'main' into glitch-soc/merge-upstream	2021-03-02 12:06:58 +01:00
support
validators	Merge branch 'main' into glitch-soc/merge-upstream	2021-03-02 12:06:58 +01:00
views
workers	Fix being able to import more than allowed number of follows (#15384)	2020-12-26 23:52:46 +01:00
rails_helper.rb
spec_helper.rb