Claire 64b2c712d4 Merge commit '9d0bce40724eb77b7cc3917091b62e4ab159e29e' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict because upstream refactored theme-related code, and glitch-soc has
  a different theming system.

2024-07-15 18:51:38 +02:00

..

environments

Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' 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 '2ea9336b6855b44126a55106a81e96ea68eaf8ff' into glitch-soc/merge-upstream

2024-07-10 16:58:06 +02:00

locales

New Crowdin Translations (automated) (#31018)

2024-07-15 07:44:37 +00:00

locales-glitch

New Crowdin Translations (automated) (#2738)

2024-07-10 18:18:15 +02:00

routes

Merge commit '967505ee9bcacf0e5189aa06c654ff586c198a46' into glitch-soc/merge-upstream

2024-07-09 20:39:09 +02:00

templates

Unpluralize mistakenly changed privacy template (#30759)

2024-06-18 21:34:17 +00:00

webpack

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

application.rb

Fix compatibility with Redis < 6.2 again (#30412)

2024-06-19 16:59:37 +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

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 '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream

2023-12-20 22:16:50 +01:00

navigation.rb

Merge commit '2c5ab8f647841ea8075ece50ccc9e12c21af8720' into glitch-soc/merge-upstream

2024-05-22 21:05:19 +02:00

pghero.yml

Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595)

2020-05-04 13:52:41 +02:00

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 '8c8bee5a36e0cd0b5d35903f8891896447c3e060' into glitch-soc/merge-upstream

2024-07-11 21:07:03 +02:00

secrets.yml

Upgrade to Rails 5.0.0.1

2016-08-17 17:58:00 +02:00

settings.yml

Merge commit '02ea16150647ac3baf0bb8a89203ccc7200b4a2f' 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

Update Mastodon to Rails 6.1 (#15910)

2021-03-24 10:44:31 +01:00

webpacker.yml

Merge commit '3f6887557b23d363e7f8f18518db4447739d64bb' into glitch-soc/merge-upstream

2024-05-04 14:59:00 +02:00