Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse source 
Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb

Moved public.js changes to settings.js.
This commit is contained in:
Thibaut Girka 2018-12-09 13:28:09 +01:00
commit e7f1bfdc2d
47 changed files with 751 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/settings/preferences_controller.rb
View file

@ -43,6 +43,7 @@ class Settings::PreferencesController < Settings::BaseController
:setting_system_font_ui,
:setting_noindex,
:setting_hide_network,
:setting_aggregate_reblogs,
notification_emails: %i(follow follow_request reblog favourite mention digest report),
interactions: %i(must_be_follower must_be_following)
)