djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-15 04:03:06 -05:00
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/config
History
Claire 33d30632fb Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/public_feed.rb`:
  Upstream refactored a bit, glitch-soc had specific code for local-only
  statuses.
  Updated glitch-soc's specific code accordingly.
2021-01-11 11:55:42 +01:00
..
environments
Merge branch 'master' into glitch-soc/merge-upstream
2020-07-15 15:32:40 +02:00
initializers
Merge branch 'master' into glitch-soc/merge-upstream
2021-01-11 11:55:42 +01:00
locales
Fix typo: you -> your (#15476)
2021-01-07 09:32:16 +01: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
Optimize map { ... }.compact calls (#15513)
2021-01-10 00:32:01 +01:00
boot.rb
Add clean error message when RAILS_ENV is unset (#15381)
2020-12-20 18:05:03 +01:00
brakeman.ignore
Fix performance on instances list in admin UI (#15282)
2020-12-14 09:06:34 +01: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.14.0 to 3.14.1 (#14037)
2020-06-17 06:31:30 +02: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 'master' into glitch-soc/merge-upstream
2020-10-21 19:10:50 +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 'master' into glitch-soc/merge-upstream
2020-11-20 13:27:48 +01:00
secrets.yml
Upgrade to Rails 5.0.0.1
2016-08-17 17:58:00 +02:00
settings.yml
Merge branch 'master' into glitch-soc/merge-upstream
2020-12-15 14:27:06 +01:00
sidekiq.yml
Fix to isolate the sidekiq process that runs the scheduler job (#15314)
2020-12-15 03:04:03 +01:00
webpacker.yml
Do not try to parse gif files as CSS or JS
2019-03-16 14:23:50 +01:00