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 bd349cb850 Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream ... Conflicts: - `db/schema.rb`: Upstream regenerated the schema file using Rails 7, the conflicts are caused by our extra columns. Applied upstream's changes, but keeping our extra columns.		1 year ago
..
environments	Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream	1 year ago
imagemagick	Merge pull request from GHSA-9928-3cp5-93fm	1 year ago
initializers	Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream	1 year ago
locales	Remove 16:9 cropping from web UI (#26132)	1 year ago
locales-glitch	New Crowdin translations (#2327)	1 year ago
routes	Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream	1 year ago
webpack	Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream	1 year ago
application.rb	Override default Action Mailer `preview_path` (#26110)	1 year ago
boot.rb	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	1 year ago
brakeman.ignore	Refactor `Status.tagged_with_all` for brakeman SQL injection warning (#25941)	1 year ago
database.yml	Fix not actually connecting to the configured replica (#25977)	1 year ago
deploy.rb	Fix Performance/CollectionLiteralInLoop cop (#24819)	1 year 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 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream	1 year ago
navigation.rb	Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream	1 year ago
pghero.yml	Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595)	4 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 '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream	1 year ago
secrets.yml	Upgrade to Rails 5.0.0.1	8 years ago
settings.yml	Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' into glitch-soc/merge-upstream	1 year ago
sidekiq.yml	Bump sidekiq-scheduler from 4.0.3 to 5.0.0 (#23212)	2 years ago
storage.yml	Update Mastodon to Rails 6.1 (#15910)	4 years ago
webpacker.yml	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago