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.
nyastodon/config
Claire 30ee7339d3 Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream
Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream changed code style change, including on a line modified by glitch-soc.
  Kept glitch-soc's line but with the code style change applied.
5 months ago
..
environments Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 5 months ago
imagemagick
initializers Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream 5 months ago
locales New Crowdin Translations (automated) (#28373) 5 months ago
locales-glitch Fix i18n unused check being tripped by `no` in YAML files (#2496) 6 months ago
routes Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream 5 months ago
webpack Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream 5 months ago
application.rb Change Rails' cache format to 7.0 (#27393) 5 months ago
boot.rb Fix `Style/StderrPuts` cop (#28389) 5 months ago
brakeman.yml
database.yml Using Sidekiq concurrency for default db pool value (#26488) 6 months ago
deploy.rb Fix `Lint/SymbolConversion` cop (#28175) 6 months ago
environment.rb
formatjs-formatter.js
i18n-tasks.yml Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 5 months ago
navigation.rb
pghero.yml
puma.rb
roles.yml
routes.rb Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream 5 months ago
secrets.yml
settings.yml
sidekiq.yml
storage.yml
webpacker.yml