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 656a41db2a Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream has updated its README, we have a completely different one. Kept ours. - `app/views/auth/sessions/two_factor.html.haml`: Upstream refactored stuff and the conflict is because of glitch-soc's theming system. Ported upstream changes while accounting for the different theming system.		1 year ago
..
chewy	Add new public status index (#26344)	1 year ago
config/initializers	Fix RSpec/ContextWording cop (#24739)	2 years ago
controllers	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
fabrication	Restore console behavior in `test` env (#26401)	1 year ago
fabricators	Add admin notifications for new Mastodon versions (#26582)	1 year ago
features	Add system specs for admin area `batch` actions (#25027)	1 year ago
fixtures	Spec media attachment speedups (#25416)	1 year ago
generators	Clean up the post deployment migration generator (#24233)	2 years ago
helpers	Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream	1 year ago
lib	Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream	1 year ago
locales	Replace i18n view spec with helper spec (#24966)	2 years ago
mailers	Add admin notifications for new Mastodon versions (#26582)	1 year ago
models	Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream	1 year ago
policies	Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream	1 year ago
presenters	Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream	1 year ago
requests	Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream	1 year ago
routing	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
search/models/concerns	Add search tests (#26703)	1 year ago
serializers	Fix incorrect serialization of regional languages in `contentMap` (#27207)	1 year ago
services	Fix duplicate reports being sent when reporting some remote posts (#27355)	1 year ago
support	Add end-to-end (system) tests (#25461)	1 year ago
system	Add end-to-end (system) tests (#25461)	1 year ago
validators	Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream	1 year ago
views/statuses	Update rubocop and rubocop-rspec (#26329)	1 year ago
workers	Add admin notifications for new Mastodon versions (#26582)	1 year ago
rails_helper.rb	Add search tests (#26703)	1 year ago
spec_helper.rb	Add search tests (#26703)	1 year ago