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.
catstodon/config
Jeremy Kescher 2df3b9f803
Merge branch 'refs/heads/glitch-soc' into develop
# Conflicts:
#	app/serializers/initial_state_serializer.rb
2 weeks ago
..
environments Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream 3 months ago
imagemagick Fix AVIF attachments (#26264) 9 months ago
initializers Merge branch 'refs/heads/glitch-soc' into develop 2 weeks ago
locales Merge branch 'refs/heads/glitch-soc' into develop 2 weeks ago
locales-glitch Merge branch 'refs/heads/glitch-soc' into develop 2 weeks ago
routes Merge branch 'glitch-soc' into develop 1 month ago
templates Move privacy policy into markdown file (#28699) 3 months ago
webpack Merge commit '01b6c83c369061c2175d50dfb3ae1db502862664' into glitch-soc/merge-upstream 3 months ago
application.rb Enable Rails 7.1 Marshalling format (#28609) 4 months ago
boot.rb Use `abort` instead of `warn(); exit` in boot.rb env check (#29209) 2 months ago
brakeman.yml Configure brakeman to ignore url safe preview card urls (#25883) 6 months ago
database.yml Using Sidekiq concurrency for default db pool value (#26488) 6 months ago
deploy.rb Fix `Lint/SymbolConversion` cop (#28175) 5 months ago
environment.rb Enable Rubocop Style/FrozenStringLiteralComment (#23793) 10 months ago
formatjs-formatter.js Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream 11 months ago
i18n-tasks.yml Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 4 months ago
navigation.rb Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream 2 weeks ago
pghero.yml Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595) 4 years ago
puma.rb Enable Rubocop Style/FrozenStringLiteralComment (#23793) 10 months ago
roles.yml Add customizable user roles (#18641) 2 years ago
routes.rb Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream 2 weeks ago
secrets.yml Upgrade to Rails 5.0.0.1 8 years ago
settings.yml Merge branch 'glitch-soc' into develop 2 months ago
sidekiq.yml Merge branch 'glitch-soc' into develop 2 months ago
storage.yml Update Mastodon to Rails 6.1 (#15910) 3 years ago
webpacker.yml Merge commit '4ad1c5aa7174e5cef4ba9608a44429916a119bee' into glitch-soc/merge-upstream 8 months ago