Claire 92fa9d34b0 Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/authorize_interactions_controller.rb`: Small conflict due to our theming system. - `streaming/index.js`: Upstream refactored part of the streaming server. We had some extra logic for handling local-only posts. Applied the refactor.		2023-07-30 16:11:55 +02:00
..
environments	Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream	2023-07-13 13:35:15 +02:00
imagemagick	Merge pull request from GHSA-9928-3cp5-93fm	2023-07-06 15:05:05 +02:00
initializers	Merge commit '1814990a3d117555153321216fa593e4d9e84de3' into glitch-soc/merge-upstream	2023-07-30 15:54:34 +02:00
locales	Change interaction modal in web UI (#26075)	2023-07-27 16:11:17 +02:00
locales-glitch	New Crowdin translations (#2327)	2023-07-27 19:25:29 +02:00
routes	Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream	2023-07-30 16:11:55 +02:00
webpack	Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream	2023-07-30 13:42:06 +02:00
application.rb	Override default Action Mailer `preview_path` (#26110)	2023-07-21 21:12:57 +02:00
boot.rb	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00
brakeman.ignore	Refactor `Status.tagged_with_all` for brakeman SQL injection warning (#25941)	2023-07-13 15:52:37 +02:00
database.yml	Fix not actually connecting to the configured replica (#25977)	2023-07-17 08:26:52 +02:00
deploy.rb	Fix Performance/CollectionLiteralInLoop cop (#24819)	2023-05-04 05:33:55 +02:00
environment.rb	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00
formatjs-formatter.js	Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream	2023-06-10 12:38:33 +02:00
i18n-tasks.yml	Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream	2023-07-30 14:33:28 +02:00
navigation.rb	Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream	2023-06-18 13:41:33 +02:00
pghero.yml	…
puma.rb	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00
roles.yml	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
routes.rb	Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream	2023-07-30 16:11:55 +02:00
secrets.yml	…
settings.yml	Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' into glitch-soc/merge-upstream	2023-05-25 22:49:18 +02:00
sidekiq.yml	Bump sidekiq-scheduler from 4.0.3 to 5.0.0 (#23212)	2023-02-13 13:31:42 +01:00
storage.yml	Update Mastodon to Rails 6.1 (#15910)	2021-03-24 10:44:31 +01:00
webpacker.yml	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-03 17:40:59 +02:00