You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/config
Claire e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/models/form/admin_settings.rb`:
  New setting added upstream. Ported it.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream removed RTL classes. Did the same.
- `config/settings.yml`:
  New setting added upstream. Ported it.
5 years ago
..
environments Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
initializers Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
locales Add "invite request content" display in user account admin page (#15265) 5 years ago
locales-glitch Glitchsoc translation to 'es' language (#1439) 5 years ago
webpack Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
application.rb Fix streaming API allowing connections to persist after access token invalidation (#15111) 5 years ago
boot.rb Fix bootsnap cache directory being declared relatively (#9511) 7 years ago
brakeman.ignore Fix performance on instances list in admin UI (#15282) 5 years ago
database.yml config: add DB_SSLMODE for managed/remote PG (#10210) 6 years ago
deploy.rb Bump capistrano from 3.14.0 to 3.14.1 (#14037) 5 years ago
environment.rb
i18n-tasks.yml Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
navigation.rb Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
pghero.yml Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595) 5 years ago
puma.rb Add PERSISTENT_TIMEOUT option (#11756) 6 years ago
routes.rb Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
secrets.yml
settings.yml Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
sidekiq.yml Fix to isolate the sidekiq process that runs the scheduler job (#15314) 5 years ago
webpacker.yml Do not try to parse gif files as CSS or JS 6 years ago