mirror/blueb-Chuckya-fe-standalone
1
0
Fork 0
mirror of https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git synced 2026-01-12 22:13:16 -08:00
Code Issues Projects Releases Packages Wiki Activity
blueb-Chuckya-fe-standalone/config/environments
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
..
development.rb Refactor monkey-patching of PrivateAddressCheck (#24122) 2023-03-16 04:33:38 +01:00
production.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-03-22 19:50:11 +01:00
test.rb Workaround the ActiveRecord / Marshal serialization bug on Ruby 3.2 (#24142) 2023-03-17 14:37:30 +01:00