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.		2023-10-17 20:59:18 +02:00
..
chewy	Add new public status index (#26344)	2023-08-24 16:40:04 +02:00
config/initializers	Fix RSpec/ContextWording cop (#24739)	2023-05-04 05:49:08 +02:00
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2023-09-19 17:07:29 +02:00
fabrication	Restore console behavior in test env (#26401)	2023-08-09 11:26:56 +02:00
fabricators	Add admin notifications for new Mastodon versions (#26582)	2023-09-01 17:47:07 +02:00
features	Add system specs for admin area batch actions (#25027)	2023-10-13 10:42:59 +02:00
fixtures	Spec media attachment speedups (#25416)	2023-08-07 17:58:12 +02:00
generators	Clean up the post deployment migration generator (#24233)	2023-04-11 11:25:29 +02:00
helpers	Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream	2023-10-08 17:26:43 +02:00
lib	Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream	2023-10-17 20:59:18 +02:00
locales	Replace i18n view spec with helper spec (#24966)	2023-05-15 17:25:04 +02:00
mailers	Add admin notifications for new Mastodon versions (#26582)	2023-09-01 17:47:07 +02:00
models	Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream	2023-10-08 17:30:48 +02:00
policies	Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream	2023-09-15 20:57:40 +02:00
presenters	Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream	2023-06-10 16:48:01 +02:00
requests	Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream	2023-10-08 17:26:43 +02:00
routing	Enable Style/FrozenStringLiteralComment for specs (#23790)	2023-02-22 09:55:31 +09:00
search/models/concerns	Add search tests (#26703)	2023-09-08 16:17:55 +02:00
serializers	Fix incorrect serialization of regional languages in contentMap (#27207)	2023-10-06 17:46:04 +02:00
services	Fix duplicate reports being sent when reporting some remote posts (#27355)	2023-10-10 16:00:50 +02:00
support	Add end-to-end (system) tests (#25461)	2023-07-28 23:09:49 +02:00
system	Add end-to-end (system) tests (#25461)	2023-07-28 23:09:49 +02:00
validators	Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream	2023-08-11 22:15:41 +02:00
views/statuses	Update rubocop and rubocop-rspec (#26329)	2023-08-22 09:31:40 +02:00
workers	Add admin notifications for new Mastodon versions (#26582)	2023-09-01 17:47:07 +02:00
rails_helper.rb	Add search tests (#26703)	2023-09-08 16:17:55 +02:00
spec_helper.rb	Add search tests (#26703)	2023-09-08 16:17:55 +02:00