hometown/config
nachtjasmin 633b9e995b
Merge tag 'v4.1.5' into lets-bump-hometown-to-mastodon-4.2
Conflict resolution:

- chose their content_security_policy_spec.rb
- reordered options in app/lib/request.rb, should reduce conflicts
2023-11-16 23:20:13 +01:00
..
environments Add cache headers to static files served through Rails (#24120) 2023-03-16 11:43:18 +01:00
imagemagick Merge upstream security fixes of v4.0.5 (#1316) 2023-07-06 12:30:13 -07:00
initializers Merge tag 'v4.1.3' into lets-bump-hometown-to-mastodon-4.2 2023-11-16 23:17:27 +01:00
locales Merge tag 'v4.1.0' into lets-bump-hometown-to-mastodon-4.2 2023-11-16 22:44:18 +01:00
webpack Add brotli compression (#19025) 2022-12-15 17:07:36 +01:00
application.rb Merge tag 'v4.1.1' into lets-bump-hometown-to-mastodon-4.2 2023-11-16 22:55:34 +01:00
boot.rb Bump bootsnap from 1.6.0 to 1.8.1 (#16677) 2021-09-19 14:42:32 +09:00
brakeman.ignore Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2022-03-22 10:07:11 +01:00
database.yml Merge tag 'v4.1.0rc1' into lets-bump-hometown-to-mastodon-4.2 2023-11-16 22:31:22 +01:00
deploy.rb Change `master` branch to `main` branch (#20290) 2022-11-10 04:02:05 +01:00
environment.rb
i18n-tasks.yml Add confirmation screen when handling reports (#22375) 2023-01-18 16:40:09 +01:00
navigation.rb Change automatic post deletion configuration to be accessible to redirected users (#20774) 2022-11-17 10:55:23 +01:00
pghero.yml Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595) 2020-05-04 13:52:41 +02:00
puma.rb Support the PROXY protocol through the PROXY_PROTO_V1 env variable (#24064) 2023-03-16 11:42:27 +01:00
roles.yml Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
routes.rb Merge tag 'v4.1.0rc1' into lets-bump-hometown-to-mastodon-4.2 2023-11-16 22:31:22 +01:00
secrets.yml
settings.yml Add option to make the landing page be /about even when trends are enabled (#20808) 2023-01-18 16:43:58 +01:00
sidekiq.yml Add environment variable to configure sidekiq concurrency (#19589) 2022-12-15 16:38:37 +01:00
storage.yml Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
themes.yml Merge branch 'fairy-floss-theme' of github.com:emmawinston/hometown into hometown-dev 2019-08-31 15:38:45 -07:00
webpacker.yml