Commit graph

9 commits

Author SHA1 Message Date
Jeremy Kescher
895b479c23
Merge branch 'refs/heads/glitch-soc' into develop 2024-06-17 22:52:08 +02:00
Jeremy Kescher
209f90f670
Merge branch 'refs/heads/glitch-soc' into develop 2024-06-16 05:32:45 +02:00
Matt Jankowski
0e1110c947
Use SECRET_KEY_BASE_DUMMY feature as placeholder during asset compilation (#30505) 2024-06-10 20:08:04 +00:00
Matt Jankowski
0cf91213c9
Opt in to remaining Rails 7.1 defaults (#30332)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-06-10 06:32:20 +00:00
Jeremy Kescher
fae98d1deb
Merge branch 'refs/heads/glitch-soc' into develop
# Conflicts:
#	app/javascript/flavours/glitch/initial_state.js
#	app/javascript/mastodon/initial_state.js
2024-05-20 23:57:04 +02:00
Claire
12472e7f40
Add emphasis on ActiveRecord Encryption configuration values being secret (#30340) 2024-05-17 09:28:40 +00:00
Jeremy Kescher
480be5e60c
Add changelog info for v4.3.0-alpha.3+glitch+cat+1.2.0 2024-05-12 00:25:31 +02:00
Claire
33368e3e79
Change ActiveRecordEncryption variable to be more explicit (#30151) 2024-05-03 09:26:24 +00:00
Matt Jankowski
828299e71c
Enable AR Encryption (#29831) 2024-04-17 09:19:02 +00:00