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
commit fa574e4ec3
5 changed files with 5 additions and 2 deletions
Show Stats 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 def user_settings_params
params.require(:user).permit( 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) interactions: %i(must_be_follower must_be_following must_be_following_dm)
) )
end end

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

@ -51,7 +51,7 @@ class Settings::PreferencesController < Settings::BaseController
:setting_show_application, :setting_show_application,
:setting_advanced_layout, :setting_advanced_layout,
:setting_group_in_home_feed, :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) interactions: %i(must_be_follower must_be_following)
) )
end end

1
app/views/settings/notifications/show.html.haml
View File

@ -11,6 +11,7 @@
= ff.input :reblog, as: :boolean, wrapper: :with_label = ff.input :reblog, as: :boolean, wrapper: :with_label
= ff.input :favourite, as: :boolean, wrapper: :with_label = ff.input :favourite, as: :boolean, wrapper: :with_label
= ff.input :mention, 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? - if current_user.staff?
= ff.input :report, as: :boolean, wrapper: :with_label = ff.input :report, as: :boolean, wrapper: :with_label

1
config/locales/simple_form.en.yml
View File

@ -132,6 +132,7 @@ en:
pending_account: Send e-mail when a new account needs review pending_account: Send e-mail when a new account needs review
reblog: Send e-mail when someone reposts your status reblog: Send e-mail when someone reposts your status
report: Send e-mail when a new report is submitted 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' 'no': 'No'
required: required:
mark: "*" mark: "*"

1
config/settings.yml
View File

@ -41,6 +41,7 @@ defaults: &defaults
digest: true digest: true
report: true report: true
pending_account: true pending_account: true
emails_from_gabcom: true
interactions: interactions:
must_be_follower: false must_be_follower: false
must_be_following: false must_be_following: false