Claire e67e07211f Merge commit 'ad95c98054' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream removed their direct dependency `autoprefixer`, which was textually adjacent to glitch-soc-only dependency `atrament`. Removed direct dependency on `autoprefixer`. - `yarn.lock`: Upstream removed their direct dependency `autoprefixer`, which was textually adjacent to glitch-soc-only dependency `atrament`. Removed direct dependency on `autoprefixer`.		2024-08-02 18:09:48 +02:00
..
environments	Merge commit 'd5f02adad7' into glitch-soc/merge-upstream	2024-06-17 18:30:28 +02:00
imagemagick	Drop favicon.ico generation (#30375)	2024-06-26 13:44:08 +00:00
initializers	Merge commit '887e64efd4' into glitch-soc/merge-upstream	2024-07-25 17:47:02 +02:00
locales	New Crowdin Translations (automated) (#31261)	2024-08-02 07:01:04 +00:00
locales-glitch	New Crowdin Translations (automated) (#2738)	2024-07-10 18:18:15 +02:00
routes	Merge commit 'ad95c98054' into glitch-soc/merge-upstream	2024-08-02 18:09:48 +02:00
templates	Unpluralize mistakenly changed privacy template (#30759)	2024-06-18 21:34:17 +00:00
webpack	Merge commit '06f070d86d' into glitch-soc/merge-upstream	2024-07-24 20:07:37 +02:00
application.rb	Enable OAuth PKCE Extension (#31129)	2024-07-26 08:53:10 +00:00
boot.rb	Use abort instead of warn(); exit in boot.rb env check (#29209)	2024-02-16 14:29:24 +00:00
brakeman.yml	Configure brakeman to ignore url safe preview card urls (#25883)	2023-10-20 15:32:16 +02:00
database.yml	Using Sidekiq concurrency for default db pool value (#26488)	2023-11-08 13:15:43 +00:00
environment.rb
formatjs-formatter.js
i18n-tasks.yml	Merge commit '0b4a3a0437' into glitch-soc/merge-upstream	2023-12-20 22:16:50 +01:00
navigation.rb	Merge commit '1229d2907a' into glitch-soc/merge-upstream	2024-07-29 19:16:58 +02:00
pghero.yml
puma.rb
roles.yml
routes.rb	Merge commit '598ae4f2da' into glitch-soc/merge-upstream	2024-07-30 20:47:34 +02:00
secrets.yml
settings.yml	Merge commit '02ea161506' into glitch-soc/merge-upstream	2024-05-01 14:25:47 +02:00
sidekiq.yml	Automatically switch from open to approved registrations in absence of moderators (#29318)	2024-02-22 20:45:40 +01:00
storage.yml
webpacker.yml	Merge commit '3f6887557b' into glitch-soc/merge-upstream	2024-05-04 14:59:00 +02:00