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 1cd7f5ff17 Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream ... Conflicts: - `.eslintrc.js`: Upstream moved a configuration block in which we had added a glitch-only path. Moved the configuration block as upstream did. - other files: Upstream reordered imports, and those files had different ones. Kept our version and reordered imports using the same rules.		1 year ago
..
environments	Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream	2 years ago
initializers	Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream	2 years ago
locales	Fix being able to vote on your own polls (#25015)	2 years ago
locales-glitch	Change captcha to be presented even for invited users (#2227)	2 years ago
routes	Merge commit 'e60414792d86a99c0f401f3c1bab92ee37835d39' into glitch-soc/merge-upstream	2 years ago
webpack	Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream	1 year ago
application.rb	Remove `tai` locale (#23880)	2 years ago
boot.rb	Bump bootsnap from 1.6.0 to 1.8.1 (#16677)	3 years 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)	2 years ago
environment.rb	Make PreviewCard records reuseable between statuses (#4642)	7 years ago
i18n-tasks.yml	Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream	2 years ago
navigation.rb	Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream	2 years ago
pghero.yml	Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595)	5 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	Add hCaptcha support (#25019)	2 years ago
secrets.yml	Upgrade to Rails 5.0.0.1	8 years ago
settings.yml	Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' into glitch-soc/merge-upstream	2 years 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	2 years ago