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 178e151019 Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream ... Conflicts: - `app/models/user_settings.rb`: Upstream added a constraint on a setting textually close to glitch-soc-only settings. Applied upstream's change. - `lib/sanitize_ext/sanitize_config.rb`: Upstream added support for the `translate` attribute on a few elements, where glitch-soc had a different set of allowed elements and attributes. Extended glitch-soc's allowed attributes with `translate` as upstream did. - `spec/validators/status_length_validator_spec.rb`: Upstream refactored to use RSpec's `instance_double` instead of `double`, but glitch-soc had changes to tests due to configurable max toot chars. Applied upstream's changes while keeping tests against configurable max toot chars.		1 year ago
..
environments	Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream	1 year ago
initializers	Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream	1 year ago
locales	Add finer permission requirements for managing webhooks (#25463)	1 year ago
locales-glitch	Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream	1 year ago
routes	Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream	1 year ago
webpack	Switch to using a `common` runtime chunk rather than `locales`	1 year ago
application.rb	Remove `tai` locale (#23880)	1 year ago
boot.rb	Use default `bootsnap/setup` in boot.rb (#25502)	1 year ago
brakeman.ignore	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	3 years ago
database.yml	Fix pgBouncer resetting application name on every transaction (#23958)	2 years ago
deploy.rb	Fix Performance/CollectionLiteralInLoop cop (#24819)	1 year ago
environment.rb	Make PreviewCard records reuseable between statuses (#4642)	7 years ago
formatjs-formatter.js	Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream	1 year ago
i18n-tasks.yml	Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' 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	Support the PROXY protocol through the PROXY_PROTO_V1 env variable (#24064)	2 years ago
roles.yml	Add customizable user roles (#18641)	2 years ago
routes.rb	Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' 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