treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/config
History
Claire 5ac380c122 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/status.rb`:
  Upstream added lines close to a glitch-soc only line, not a real conflict.
  Applied upstream's changes (added hooks) while keeping glitch-soc's changes
  (`local_only` scope).
- `config/environments/production.rb`:
  Upstream removed a header, while we have glitch-soc specific ones.
  Removed the header removed upstream.
 		2023-03-22 19:50:11 +01:00
..
environments Merge branch 'main' into glitch-soc/merge-upstream 2023-03-22 19:50:11 +01:00
initializers Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
locales Update profile link verification instructions (#19723) 2023-03-22 11:22:35 +01:00
locales-glitch Normalize translations 2023-03-05 21:31:45 +01:00
webpack Merge branch 'main' into glitch-soc/merge-upstream 2023-02-13 19:35:35 +01:00
application.rb Add cache headers to static files served through Rails (#24120) 2023-03-16 02:55:54 +01:00
boot.rb
…
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 Fix pgBouncer resetting application name on every transaction (#23958) 2023-03-05 01:52:42 +01:00
deploy.rb Change `master` branch to `main` branch (#20290) 2022-11-10 04:02:05 +01:00
environment.rb
…
i18n-tasks.yml Merge branch 'main' into glitch-soc/merge-upstream 2023-01-18 17:38:11 +01:00
navigation.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00
pghero.yml
…
puma.rb Support the PROXY protocol through the PROXY_PROTO_V1 env variable (#24064) 2023-03-14 14:47:57 +01:00
roles.yml Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
routes.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-03-22 19:50:11 +01:00
secrets.yml
…
settings.yml Merge branch 'main' into glitch-soc/merge-upstream 2023-01-18 17:38:11 +01:00
sidekiq.yml Bump sidekiq-scheduler from 4.0.3 to 5.0.0 (#23212) 2023-02-13 13:31:42 +01:00
storage.yml
…
webpacker.yml Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00