luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-16 20:03:24 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/config
History
Claire e193c848fe Merge commit '97e4011c3ce31c6d492d5f103e95a35b6ebdc9bd' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream added some code to add the Identity Provider's sign-in endpoint to
  the `form-action` Content Security Policy directive but our version of the
  file is pretty different.
  Ported the change.
2023-09-15 21:25:05 +02:00
..
environments Merge branch 'main' into glitch-soc/merge-upstream 2023-09-05 20:34:17 +02:00
imagemagick Fix AVIF attachments (#26264) 2023-08-01 19:34:11 +02:00
initializers Merge commit '97e4011c3ce31c6d492d5f103e95a35b6ebdc9bd' into glitch-soc/merge-upstream 2023-09-15 21:25:05 +02:00
locales Add timezone to datetimes in e-mails (#26822) 2023-09-06 17:25:39 +02:00
locales-glitch New Crowdin translations (#2388) 2023-08-29 08:28:45 +02:00
routes Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream 2023-09-02 15:02:29 +02:00
webpack Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream 2023-09-15 21:06:45 +02:00
application.rb Allow setting a custom HTTP method in CacheBuster (#26528) 2023-08-18 08:18:40 +02:00
boot.rb Enable Rubocop Style/FrozenStringLiteralComment (#23793) 2023-07-12 09:47:08 +02:00
brakeman.ignore Ignore the brakeman PermitAttributes check (#25915) 2023-07-28 23:17:53 +02:00
brakeman.yml Ignore the brakeman PermitAttributes check (#25915) 2023-07-28 23:17:53 +02:00
database.yml Change DB_REPLICA_* environment variables to REPLICA_DB_* (#26386) 2023-08-08 13:59:40 +02:00
deploy.rb
environment.rb Enable Rubocop Style/FrozenStringLiteralComment (#23793) 2023-07-12 09:47:08 +02:00
formatjs-formatter.js
i18n-tasks.yml Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream 2023-09-02 14:44:47 +02:00
navigation.rb Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream 2023-09-02 15:02:29 +02:00
pghero.yml
puma.rb Enable Rubocop Style/FrozenStringLiteralComment (#23793) 2023-07-12 09:47:08 +02:00
roles.yml
routes.rb Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream 2023-07-30 16:11:55 +02:00
secrets.yml
settings.yml
sidekiq.yml Add admin notifications for new Mastodon versions (#26582) 2023-09-01 17:47:07 +02:00
storage.yml
webpacker.yml Merge commit '4ad1c5aa7174e5cef4ba9608a44429916a119bee' into glitch-soc/merge-upstream 2023-09-02 13:31:15 +02:00