Claire 077183a121 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/settings/preferences_controller.rb`: Upstream dropping `digest` from notifications emails while we have more notification emails settings. Removed `digest` from our list while keeping our extra settings. - `app/javascript/packs/admin.js`: Conflicts caused by glitch-soc's theming system. Applied the changes to `app/javascript/core/admin.js`. - `app/views/settings/preferences/other/show.html.haml`: Upstream removed a setting close to a glitch-soc-only setting. Applied upstream's change.		2022-08-28 11:31:00 +02:00
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-26 22:49:47 +02:00
admin	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-28 11:31:00 +02:00
api	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-28 11:31:00 +02:00
auth	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-25 05:07:39 +02:00
concerns	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-28 11:31:00 +02:00
disputes	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-02 18:02:48 +01:00
filters	Add ability to filter individual posts (#18945)	2022-08-25 04:27:47 +02:00
oauth	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-01 16:52:27 +02:00
settings	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-28 11:31:00 +02:00
well_known
about_controller.rb
account_follow_controller.rb
account_unfollow_controller.rb
accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-11 09:37:48 +02:00
application_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-07-05 09:33:44 +02:00
authorize_interactions_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-01 16:52:27 +02:00
custom_css_controller.rb	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
directories_controller.rb
emojis_controller.rb
filters_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-25 05:07:39 +02:00
follower_accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-08 20:22:54 +01:00
following_accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-01 16:52:27 +02:00
health_controller.rb
home_controller.rb
instance_actors_controller.rb
intents_controller.rb
invites_controller.rb
manifests_controller.rb
media_controller.rb
media_proxy_controller.rb	Refactor how Redis locks are created (#18400)	2022-05-13 00:02:35 +02:00
public_timelines_controller.rb
relationships_controller.rb
remote_follow_controller.rb
remote_interaction_controller.rb
shares_controller.rb
statuses_cleanup_controller.rb
statuses_controller.rb
tags_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-11 09:37:48 +02:00