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.

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.		3 years ago
..
controllers	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
fabricators	Add authentication history (#16408)	3 years ago
features	…
fixtures	…
helpers	…
lib	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
mailers	Add Ruby 3.0 support (#16046)	4 years ago
models	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
policies	…
presenters	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
requests	Further preparation for Rails 6 (#15916)	4 years ago
routing	…
serializers/activitypub	…
services	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
support	…
validators	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
views	…
workers	Change Web Push API deliveries to use request pooling (#16014)	4 years ago
rails_helper.rb	…
spec_helper.rb	…