luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-07 23:44:33 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/config
History
Claire 4e3c68e025 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/accounts_helper.rb`:
  Upstream fixed an issue that glitch-soc did not have, in a place with
  glitch-soc changes to hide the number of followers.
  Kept glitch-soc's code.
2022-03-17 19:23:39 +01:00
..
environments Merge branch 'main' into glitch-soc/merge-upstream 2022-01-28 08:58:32 +01:00
initializers Merge branch 'main' into glitch-soc/merge-upstream 2022-03-15 20:45:27 +01:00
locales Remove old files for renamed translation (#17818) 2022-03-17 12:54:07 +01: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 Add support for multiple source files per pack 2022-02-12 00:10:28 +01:00
application.rb Fix wrong language code for Kurdish languages (#17812) 2022-03-17 01:37:03 +01:00
boot.rb Bump bootsnap from 1.6.0 to 1.8.1 (#16677) 2021-09-19 14:42:32 +09:00
brakeman.ignore Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
database.yml Escape database passwords in config/database.yml (#17627) 2022-02-25 01:16:52 +01:00
deploy.rb Change references to tootsuite/mastodon to mastodon/mastodon (#16491) 2021-07-13 15:46:20 +02:00
environment.rb
i18n-tasks.yml Merge branch 'main' into glitch-soc/merge-upstream 2022-02-23 18:13:12 +01: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-03-10 09:52:45 +01:00
secrets.yml
settings.yml Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
sidekiq.yml Change e-mail domain blocks to block IPs dynamically (#17635) 2022-02-24 17:28:23 +01: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