Claire be493b6c0d Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Not a real conflict, just upstream getting rid of unused constants too close to glitch-soc-specific contents. Removed unused constants like upstream did. - `app/models/trends.rb`: Conflict because glitch-soc disabled email notifications for trending links. Upstream has refactored this quite a bit and added trending posts. Took upstream code, but disabling the extra trending stuff will come in another commit. - `app/views/admin/trends/links/index.html.haml`: Conflict due to glitch-soc's theming system. Ported upstream changes accordingly.		2022-02-26 09:29:23 +01:00
..
activitypub	Fix some flaky tests that randomly failed because of item ordering (#17509)	2022-02-10 22:00:10 +01:00
admin	Change e-mail domain blocks to block IPs dynamically (#17635)	2022-02-24 17:28:23 +01:00
api	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-26 09:29:23 +01:00
auth	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
concerns	Change public profile pages to be disabled for unconfirmed users (#17385)	2022-01-28 14:24:37 +01:00
disputes	Add appeals (#17364)	2022-02-14 21:27:53 +01:00
oauth	Bump doorkeeper from 5.3.3 to 5.4.0 (#13733)	2020-05-12 15:25:33 +02:00
settings	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-23 18:13:12 +01:00
well_known	Remove Keybase integration (#17045)	2021-11-26 05:58:18 +01:00
about_controller_spec.rb	Compensate for scrollbar disappearing when media modal visible (#8100)	2018-07-31 01:14:33 +02:00
account_follow_controller_spec.rb	Add support for reversible suspensions through ActivityPub (#14989)	2020-11-08 00:28:39 +01:00
account_unfollow_controller_spec.rb	Add support for reversible suspensions through ActivityPub (#14989)	2020-11-08 00:28:39 +01:00
accounts_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
application_controller_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-28 08:58:32 +01:00
authorize_interactions_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
emojis_controller_spec.rb	Misc. typos (#8694)	2018-09-14 00:53:09 +02:00
follower_accounts_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
following_accounts_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
health_controller_spec.rb	Fix glitch-soc-specific health check spec	2021-04-05 15:21:38 +02:00
home_controller_spec.rb	Change routing paths to use usernames in web UI (#16171)	2021-09-26 05:46:13 +02:00
instance_actors_controller_spec.rb	Fix instance actor not being dereferenceable (#17457)	2022-02-06 15:31:03 +01:00
intents_controller_spec.rb	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00
invites_controller_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
manifests_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
media_controller_spec.rb	Fix error when rendering public pages with media attachments (#16763)	2021-10-13 15:27:19 +02:00
media_proxy_controller_spec.rb	Fix media attachments enumeration (#14254)	2020-07-07 15:26:51 +02:00
relationships_controller_spec.rb	Remove PubSubHubbub-related columns from accounts table (#16170)	2021-05-07 19:32:58 +02:00
remote_follow_controller_spec.rb	Add support for reversible suspensions through ActivityPub (#14989)	2020-11-08 00:28:39 +01:00
remote_interaction_controller_spec.rb	Add specs for RemoteInteractionController (#9524)	2018-12-14 20:36:40 +01:00
shares_controller_spec.rb	Fix blurhash and autoplay not working on public pages (#11585)	2019-08-16 19:15:05 +02:00
statuses_cleanup_controller_spec.rb	Add feature to automatically delete old toots (#16529)	2021-08-09 23:11:50 +02:00
statuses_controller_spec.rb	Add support for reversible suspensions through ActivityPub (#14989)	2020-11-08 00:28:39 +01:00
tags_controller_spec.rb	Redesign public hashtag page to use a masonry layout (#9822)	2019-01-16 19:47:46 +01:00