Merge branch 'add-user-setting-for-opting-into-marketing-emails' into 'master'

Add user setting for opting into marketing emails

See merge request gitlab-org/gitlab!53921

app/assets/javascripts/profile/profile.js

@@ -42,6 +42,7 @@ export default class Profile {
     $('#user_notification_email').on('select2-selecting', (event) => {
       setTimeout(this.submitForm.bind(event.currentTarget));
     });
+    $('#user_email_opted_in').on('change', this.submitForm);
     $('#user_notified_of_own_activity').on('change', this.submitForm);
     this.form.on('submit', this.onSubmitForm);
   }

app/controllers/profiles/notifications_controller.rb

@@ -29,7 +29,7 @@ class Profiles::NotificationsController < Profiles::ApplicationController
   end
 
   def user_params
-    params.require(:user).permit(:notification_email, :notified_of_own_activity)
+    params.require(:user).permit(:notification_email, :email_opted_in, :notified_of_own_activity)
   end
 
   private

app/views/profiles/notifications/_email_settings.html.haml

@@ -4,3 +4,7 @@
   = form.select :notification_email, @user.public_verified_emails, { include_blank: false }, class: "select2", disabled: local_assigns.fetch(:email_change_disabled, nil)
   .help-block
     = local_assigns.fetch(:help_text, nil)
+.form-group
+  %label{ for: 'user_email_opted_in' }
+    = form.check_box :email_opted_in
+    %span= _('Receive product marketing emails')

changelogs/unreleased/add-user-setting-for-opting-into-marketing-emails.yml

+---
+title: Add user setting for opting into marketing emails
+merge_request: 53921
+author:
+type: added

doc/user/profile/notifications.md

@@ -56,6 +56,8 @@ Your **Global notification settings** are the default settings unless you select
   - This is the email address your notifications are sent to.
 - Global notification level
   - This is the default [notification level](#notification-levels) which applies to all your notifications.
+- Receive product marketing emails
+  - Check this checkbox if you want to receive periodic emails related to GitLab features.
 - Receive notifications about your own activity.
   - Check this checkbox if you want to receive notification about your own activity. Default: Not checked.
 

locale/gitlab.pot

@@ -24237,6 +24237,9 @@ msgstr ""
 msgid "Receive notifications about your own activity"
 msgstr ""
 
+msgid "Receive product marketing emails"
+msgstr ""
+
 msgid "Recent"
 msgstr ""
 

spec/controllers/profiles/notifications_controller_spec.rb

@@ -119,10 +119,11 @@ RSpec.describe Profiles::NotificationsController do
     it 'updates only permitted attributes' do
       sign_in(user)
 
-      put :update, params: { user: { notification_email: 'new@example.com', notified_of_own_activity: true, admin: true } }
+      put :update, params: { user: { notification_email: 'new@example.com', email_opted_in: true, notified_of_own_activity: true, admin: true } }
 
       user.reload
       expect(user.notification_email).to eq('new@example.com')
+      expect(user.email_opted_in).to eq(true)
       expect(user.notified_of_own_activity).to eq(true)
       expect(user.admin).to eq(false)
       expect(controller).to set_flash[:notice].to('Notification settings saved')