djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-02-11 21:24:03 -05:00
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/config
History
Claire 8ec4be4233 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Not a real conflict, upstream-updated dependency (redis) textually too
  close to glitch-soc-only dependecy.
  Updated redis gem like upstream did.
2021-08-09 23:25:49 +02:00
..
environments
Merge branch 'main' into glitch-soc/merge-upstream
2021-04-20 12:17:14 +02:00
initializers
Merge branch 'main' into glitch-soc/merge-upstream
2021-07-17 17:45:35 +02:00
locales
Add feature to automatically delete old toots (#16529)
2021-08-09 23:11:50 +02:00
locales-glitch
Fix typo on simple_form.ko.yml
2021-08-06 20:06:05 +02:00
webpack
Merge branch 'main' into glitch-soc/merge-upstream
2021-06-25 10:44:06 +02:00
application.rb
New Crowdin updates (#16269)
2021-05-20 00:19:52 +02:00
boot.rb
Add clean error message when RAILS_ENV is unset (#15381)
2020-12-20 18:05:03 +01:00
brakeman.ignore
Ignore brakeman false positive warning (#16213)
2021-05-11 14:18:33 +02: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-08-09 23:25:49 +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
Add PERSISTENT_TIMEOUT option (#11756)
2019-09-04 20:44:08 +02:00
routes.rb
Merge branch 'main' into glitch-soc/merge-upstream
2021-08-09 23:25:49 +02:00
secrets.yml
…
settings.yml
Merge branch 'main' into glitch-soc/merge-upstream
2021-05-07 18:21:59 +02:00
sidekiq.yml
Add feature to automatically delete old toots (#16529)
2021-08-09 23:11:50 +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