djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-23 16:44:04 -05:00
Code Issues Packages Projects Releases Wiki Activity
fec4ed5074
tootlab-mastodon/config
History
Claire b2526316f5 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/pending_accounts/index.html.haml`:
  Removed upstream, while it had glitch-soc-specific changes to accomodate
  for glitch-soc's theming system.
  Removed the file.

Additional changes:
- `app/views/admin/accounts/index.html.haml':
  Accomodate for glitch-soc's theming system.
2021-12-16 16:20:44 +01:00
..
environments Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 22:14:26 +02:00
initializers Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
locales Fix incorrect singular version of some translation strings (#17124) 2021-12-13 18:25:25 +01:00
locales-glitch Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
webpack Merge branch 'main' into glitch-soc/merge-upstream 2021-09-02 10:52:09 +02:00
application.rb Add S3_FORCE_SINGLE_REQUEST env var to work around S3 compatibility issues (#16866) 2021-10-18 18:29:04 +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 Add trending links (#16917) 2021-11-25 13:07:38 +01:00
database.yml config: add DB_SSLMODE for managed/remote PG (#10210) 2019-03-08 14:36:28 +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 'master' into glitch-soc/merge-upstream 2020-07-01 19:23:14 +02:00
navigation.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-12-16 16:20:44 +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 2021-12-16 16:20:44 +01:00
secrets.yml
settings.yml Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
sidekiq.yml Add trending links (#16917) 2021-11-25 13:07:38 +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