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 7066e3d5ce Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/profiles/show.html.haml`: Upstream redesigned the settings page, where glitch-soc had changes because of the ability to set some custom limits. Went with upstream's design while keeping our custom limits. - `yarn.lock`: Upstream updated dependencies textually close to a glitch-soc-only dependency. Updated the dependnencies as well.		1 year ago
..
environments	Merge commit '0d919f27beb6e4e7a562a6eed8f354415b5c217e' into glitch-soc/merge-upstream	2 years ago
initializers	Merge commit '68d362c0fc4d41cc97e981640bef41dea6f9f79d' into glitch-soc/merge-upstream	1 year ago
locales	Change edit profile page (#25413)	1 year ago
locales-glitch	Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' into glitch-soc/merge-upstream	1 year ago
routes	Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' 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)	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
formatjs-formatter.js	Merge commit '76960f128a764f5105c076813d8ffaa0df985dda' into glitch-soc/merge-upstream	1 year ago
i18n-tasks.yml	Merge commit '239ee4f5d10aaa30b52cc59a58b2dc33fea5615f' into glitch-soc/merge-upstream	1 year ago
navigation.rb	Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' 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	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 '239ee4f5d10aaa30b52cc59a58b2dc33fea5615f' into glitch-soc/merge-upstream	1 year ago
secrets.yml	Upgrade to Rails 5.0.0.1	8 years ago
settings.yml	Merge commit '844d8e101e84cc1c27c99005b7059a975ac826ca' 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	2 years ago