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 cdf20f4367 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/serializers/rest/instance_serializer.rb`: Upstream changed the fields returned by /api/v1/instance by adding a `configuration` field holding a lot of useful information making our `max_toot_chars` and `poll_limits` fields obsolete. Keeping those around for now for compatibility. - `app/validators/status_length_validator.rb`: No real conflict, just URL_PLACEHOLDER_CHARS introduced too close to MAX_CHARS which is defined differently in glitch-soc. Ported upstream changes.		4 years ago
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
initializers	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
locales	Add ability to filter reports by origin of target account (#16487)	4 years ago
locales-glitch	…
webpack	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
application.rb	New Crowdin updates (#16269)	4 years ago
boot.rb	…
brakeman.ignore	Ignore brakeman false positive warning (#16213)	4 years ago
database.yml	…
deploy.rb	Bump capistrano from 3.15.0 to 3.16.0 (#15818)	4 years ago
environment.rb	…
i18n-tasks.yml	…
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
pghero.yml	…
puma.rb	…
routes.rb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
secrets.yml	…
settings.yml	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
sidekiq.yml	Add cold-start follow recommendations (#15945)	4 years ago
storage.yml	Update Mastodon to Rails 6.1 (#15910)	4 years ago
webpacker.yml	…