You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire c59fb65ddc Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to glitch-soc's option to hide followers count. Ported upstream changes. Additional changes: - `app/views/application/mailer/_account.html.haml`: Ported glitch-soc's option to hide followers count. - `app/views/settings/flavours/show.html.haml`: Ported the `frontend_asset_url` helper change to glitch-soc.		10 months ago
..
environments	Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream	11 months ago
imagemagick	Fix AVIF attachments (#26264)	1 year ago
initializers	Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream	10 months ago
locales	New Crowdin Translations (automated) (#28749)	10 months ago
locales-glitch	Fix i18n unused check being tripped by `no` in YAML files (#2496)	11 months ago
routes	Merge branch 'main' into glitch-soc/merge-upstream	11 months ago
webpack	Merge commit '01b6c83c369061c2175d50dfb3ae1db502862664' into glitch-soc/merge-upstream	10 months ago
application.rb	Enable Rails 7.1 Marshalling format (#28609)	10 months ago
boot.rb	Fix `Style/StderrPuts` cop (#28389)	11 months ago
brakeman.yml	Configure brakeman to ignore url safe preview card urls (#25883)	1 year ago
database.yml	Using Sidekiq concurrency for default db pool value (#26488)	1 year ago
deploy.rb	Fix `Lint/SymbolConversion` cop (#28175)	11 months ago
environment.rb	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	1 year ago
formatjs-formatter.js	Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream	1 year ago
i18n-tasks.yml	Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream	11 months ago
navigation.rb	Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream	1 year ago
pghero.yml	Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595)	5 years ago
puma.rb	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	1 year ago
roles.yml	Add customizable user roles (#18641)	2 years ago
routes.rb	Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream	11 months ago
secrets.yml	…
settings.yml	Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' into glitch-soc/merge-upstream	1 year ago
sidekiq.yml	Add SELF_DESTRUCT env variable to process self-destructions in the background (#26439)	1 year ago
storage.yml	Update Mastodon to Rails 6.1 (#15910)	4 years ago
webpacker.yml	Merge commit '4ad1c5aa7174e5cef4ba9608a44429916a119bee' into glitch-soc/merge-upstream	1 year ago