random-mirrors/gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/emails-from-gabcom-notification-option' into 'develop'

Browse Source 
New option to notificaion preferences for emails from gab.com for...

See merge request gab/social/gab-social!26
This commit is contained in:
Rob Colbert
2019-08-01 12:48:33 +00:00
parent 21d86f2375 c832fb6cbc
commit fa574e4ec3
5 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/settings/notifications_controller.rb
View File

@@ -25,7 +25,7 @@ class Settings::NotificationsController < Settings::BaseController
def user_settings_params
params.require(:user).permit(
notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account),
notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account emails_from_gabcom),
interactions: %i(must_be_follower must_be_following must_be_following_dm)
)
end

2
app/controllers/settings/preferences_controller.rb
View File

@@ -51,7 +51,7 @@ class Settings::PreferencesController < Settings::BaseController
:setting_show_application,
:setting_advanced_layout,
:setting_group_in_home_feed,
notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account),
notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account emails_from_gabcom),
interactions: %i(must_be_follower must_be_following)
)
end