Claire 3160e050a9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change.		2021-07-08 16:17:19 +02:00
..
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +02:00
fabricators	Add authentication history (#16408)	2021-06-21 17:07:30 +02: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-05-07 18:21:59 +02:00
mailers	Add Ruby 3.0 support (#16046)	2021-05-06 14:22:54 +02:00
models	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +02:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-08 14:20:35 +01:00
presenters	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
requests	Further preparation for Rails 6 (#15916)	2021-03-19 02:45:34 +01:00
routing
serializers/activitypub
services	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +02:00
support
validators	Merge branch 'main' into glitch-soc/merge-upstream	2021-04-20 12:17:14 +02:00
views
workers	Change Web Push API deliveries to use request pooling (#16014)	2021-04-12 14:25:34 +02:00
rails_helper.rb
spec_helper.rb