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
..
action_dispatch	replace all instances of "ends_with?" with "end_with?" (#15745)	4 years ago
active_record	Remove dependency on pluck_each gem (#16012)	4 years ago
assets	…
chewy/strategy	Fix unnecessary queries when batch-removing statuses, 100x faster (#15387)	4 years ago
devise	…
generators	…
json_ld	Fixed code quality issues (#15541)	4 years ago
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
paperclip	Fix animated GIF generates animated thumbnail (#16216)	4 years ago
rails	Fix obsolete digitalocean.rake file breaking rake tasks (#15618)	4 years ago
redis	…
sanitize_ext	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
tasks	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
templates	…
terrapin	Add Ruby 3.0 support (#16046)	4 years ago
webpacker	…
cli.rb	…
enumerable.rb	Optimize map { ... }.compact calls (#15513)	4 years ago
exceptions.rb	Fix media redownload worker retrying on unexpected response codes (#16111)	4 years ago