Claire f55959ebd9 Merge commit '1d29569d89c81b439c6a1d86c8f85cc48a9649c8' into glitch-soc/merge-upstream ... Conflicts: - `db/schema.rb`: Upstream regenerated the schema file using Rails 7, the conflicts are caused by our extra columns. Applied upstream's changes, but keeping our extra columns.		2023-07-30 14:58:56 +02:00
..
environments	Merge commit '9e6c02fd815253712c2e8ba1c1ebed092a007653' 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 '1d3f8af23a23c2d3d8399d7b4367de69b72e269a' into glitch-soc/merge-upstream	2023-07-30 13:49:35 +02:00
locales	Remove 16:9 cropping from web UI (#26132)	2023-07-24 13:46:55 +02:00
locales-glitch	New Crowdin translations (#2327)	2023-07-27 19:25:29 +02:00
routes	Merge commit '528a8d0cbeaad7d73fc0dc310d4199701e0353a3' into glitch-soc/merge-upstream	2023-07-13 22:40:15 +02:00
webpack	Merge commit 'f3127af389f6043fe19c9ef4addefb6c6da0095a' 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 '76960f128a764f5105c076813d8ffaa0df985dda' into glitch-soc/merge-upstream	2023-06-10 12:38:33 +02:00
i18n-tasks.yml	Merge commit '5a5d8a97579bf2da481871588425734678019f52' into glitch-soc/merge-upstream	2023-07-30 14:33:28 +02:00
navigation.rb	Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' 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 '528a8d0cbeaad7d73fc0dc310d4199701e0353a3' into glitch-soc/merge-upstream	2023-07-13 22:40:15 +02:00
secrets.yml	…
settings.yml	Merge commit '844d8e101e84cc1c27c99005b7059a975ac826ca' 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	…
webpacker.yml	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-03 17:40:59 +02:00