mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-01-19 00:21:40 +01:00
Code Issues Projects Releases Wiki Activity
mastodon/config
History
Claire 10a31a934f Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream's README got updated, but we have a completely different one.
  Kept ours.
2021-05-27 17:58:44 +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-05-27 17:58:44 +02:00
locales
Fix some typos and improve some UI text (#16283)
2021-05-24 03:03:01 +02:00
locales-glitch
Glitchsoc translation to 'es' language (#1439)
2020-10-19 22:17:29 +02:00
webpack
Merge branch 'master' into glitch-soc/merge-upstream
2021-01-06 18:08:06 +01: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
Bump capistrano from 3.15.0 to 3.16.0 (#15818)
2021-03-05 06:38:52 +09:00
environment.rb
Make PreviewCard records reuseable between statuses (#4642)
2017-09-01 16:20:16 +02:00
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-04-20 12:17:14 +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-05-07 18:21:59 +02:00
secrets.yml
Upgrade to Rails 5.0.0.1
2016-08-17 17:58:00 +02:00
settings.yml
Merge branch 'main' into glitch-soc/merge-upstream
2021-05-07 18:21:59 +02:00
sidekiq.yml
Add cold-start follow recommendations (#15945)
2021-04-12 12:37:14 +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