luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-20 04:07:45 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/config
History
Claire 392ca0472a Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/admin.js`:
  Conflicts due to glitch-soc's theming system.
  Upstream changes have been ported to `app/javascript/core/admin.js`
- `app/models/trends/statuses.rb`:
  Minor conflict due to glitch-soc's option to allow CWed toots in trends.
  Ported upstream changes.
2022-05-01 16:52:27 +02:00
..
environments Merge branch 'main' into glitch-soc/merge-upstream 2022-04-25 17:09:32 +02:00
initializers Merge branch 'main' into glitch-soc/merge-upstream 2022-05-01 16:52:27 +02:00
locales New Crowdin updates (#18148) 2022-04-30 20:11:52 +09:00
locales-glitch Fix blank screen when trying to copy emoji with a too large file size (#1718) 2022-03-14 17:34:53 +01:00
webpack Merge branch 'main' into glitch-soc/merge-upstream 2022-04-04 17:25:57 +02:00
application.rb Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02:00
boot.rb Bump bootsnap from 1.6.0 to 1.8.1 (#16677) 2021-09-19 14:42:32 +09:00
brakeman.ignore Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2022-03-22 10:07:11 +01:00
database.yml Format JSON and YAML using Prettier (#17823) 2022-03-21 04:46:11 +01:00
deploy.rb Bump capistrano from 3.16.0 to 3.17.0 (#17774) 2022-03-29 18:49:00 +09:00
environment.rb
i18n-tasks.yml Merge branch 'main' into glitch-soc/merge-upstream 2022-04-08 19:53:32 +02:00
navigation.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-02-26 09:29:23 +01:00
pghero.yml Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595) 2020-05-04 13:52:41 +02:00
puma.rb Add PERSISTENT_TIMEOUT option (#11756) 2019-09-04 20:44:08 +02:00
routes.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-04-06 21:10:23 +02:00
secrets.yml
settings.yml Merge branch 'main' into glitch-soc/merge-upstream 2022-04-08 19:53:32 +02:00
sidekiq.yml Remove IP matching from e-mail domain blocks (#18190) 2022-04-29 23:27:03 +02:00
storage.yml Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
webpacker.yml Do not try to parse gif files as CSS or JS 2019-03-16 14:23:50 +01:00