diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-04-08 19:53:32 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-04-08 19:53:32 +0200 |
| commit | ff73d43b3596d50d071fd3e6ab6f49608b62c9d1 (patch) | |
| tree | bf8dca3a3864b013b0e55476a21fb1ad0d97c41f /config/settings.yml | |
| parent | e0c39f9fad837b77373220515f078f2443ddf553 (diff) | |
| parent | 68273a7c6d6c630b6c88764579580682e12eebce (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `Gemfile.lock`: Not a real conflict, just an upstream dependency udpated textually too close to a glitch-soc-only dependency. Updated dependencies like upstream. - `app/controllers/settings/preferences_controller.rb`: Upstream added settings where we had extra glitch-soc-specific settings. Added upstream's new settings. - `app/models/user.rb`: Upstream added settings where we had extra glitch-soc-specific settings. Added upstream's new settings. - `config/i18n-tasks.yml`: Not a real conflict, just a new upstream line too textually close to a glitch-soc-only line. Ported upstream's change.
Diffstat (limited to 'config/settings.yml')
| -rw-r--r-- | config/settings.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config/settings.yml b/config/settings.yml index 51016d322..bb2720ec2 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -43,10 +43,10 @@ defaults: &defaults trending_status_cw: true crop_images: true notification_emails: - follow: false + follow: true reblog: false favourite: false - mention: false + mention: true follow_request: true digest: true report: true @@ -55,6 +55,7 @@ defaults: &defaults trending_link: false trending_status: false appeal: true + always_send_emails: false interactions: must_be_follower: false must_be_following: false |