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.

Thibaut Girka f3eff922a3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `app/validators/poll_validator.rb`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `config/initializers/content_security_policy.rb`: Upstream added a rule, the way we compute ours is different, but that added rule has been ported. - `package.json`: No real conflict, dependency update. Performed the same update. - `yarn.lock`: No real conflict, dependency update. Performed the same update.		5 years ago
..
environments	…
initializers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
webpack	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
application.rb	Fix Paperclip using deprecated URI.escape function (#13320)	5 years ago
boot.rb	…
brakeman.ignore	…
database.yml	…
deploy.rb	Bump capistrano from 3.11.2 to 3.12.1 (#13264)	5 years ago
environment.rb	…
i18n-tasks.yml	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
navigation.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
pghero.yml	Use override_csp options on pghero (#12489)	5 years ago
puma.rb	…
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
secrets.yml	…
settings.yml	Merge branch 'master' into glitch-soc/master	5 years ago
sidekiq.yml	…
webpacker.yml	…