Commit fa574e4e authored by Rob Colbert's avatar Rob Colbert

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

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

See merge request gab/social/gab-social!26
parents 21d86f23 c832fb6c
......@@ -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
......
......@@ -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
......
......@@ -11,6 +11,7 @@
= ff.input :reblog, as: :boolean, wrapper: :with_label
= ff.input :favourite, as: :boolean, wrapper: :with_label
= ff.input :mention, as: :boolean, wrapper: :with_label
= ff.input :emails_from_gabcom, as: :boolean, wrapper: :with_label
- if current_user.staff?
= ff.input :report, as: :boolean, wrapper: :with_label
......
......@@ -132,6 +132,7 @@ en:
pending_account: Send e-mail when a new account needs review
reblog: Send e-mail when someone reposts your status
report: Send e-mail when a new report is submitted
emails_from_gabcom: Receive e-mail from Gab.com with announcements and other information
'no': 'No'
required:
mark: "*"
......
......@@ -41,6 +41,7 @@ defaults: &defaults
digest: true
report: true
pending_account: true
emails_from_gabcom: true
interactions:
must_be_follower: false
must_be_following: false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment