Claire d8fdbb054e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/validators/status_length_validator.rb`: Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real conflict. Applied upstream changes. - `package.json`: glitch-soc-only dependency textually too close to a dependency updated upstream, not a real conflict. Applied upstream changes.		2021-03-02 12:06:58 +01:00
..
environments
initializers	Merge branch 'main' into glitch-soc/merge-upstream	2021-03-02 12:06:58 +01:00
locales	Add details to error response for POST /api/v1/accounts in REST API (#15803)	2021-03-01 04:59:13 +01:00
locales-glitch
webpack	Merge branch 'master' into glitch-soc/merge-upstream	2021-01-06 18:08:06 +01:00
application.rb	Drop dependency on secure_headers, fix response headers (#15712)	2021-02-11 23:47:05 +01:00
boot.rb	Add clean error message when RAILS_ENV is unset (#15381)	2020-12-20 18:05:03 +01:00
brakeman.ignore
database.yml
deploy.rb	Bump capistrano from 3.14.1 to 3.15.0 (#15537)	2021-01-18 11:10:23 +09:00
environment.rb
i18n-tasks.yml
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-02-22 15:23:46 +01:00
pghero.yml
puma.rb
routes.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-03-02 12:06:58 +01:00
secrets.yml
settings.yml	Change default site title to not point to dev.glitch.social	2021-01-27 14:45:45 +01:00
sidekiq.yml
webpacker.yml