Merge branch '2244-remove-warning-message-in-service-desk-setting' into 'master'

Remove warning about protecting Service Desk email from form

Closes #2244

See merge request !1755

app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.js

@@ -76,13 +76,6 @@ export default {
             </template>
           </div>
         </div>
-        <p
-          ref="recommend-protect-email-from-spam-message"
-          class="settings-message">
-          We recommend you protect the external support email address.
-          Unblocked email spam would result in many spam issues being created,
-          and may disrupt your GitLab service.
-        </p>
       </template>
     </div>
   `,

changelogs/unreleased-ee/2244-remove-warning-message-in-service-desk-setting.yml

+---
+title: Remove warning about protecting Service Desk email from form
+merge_request:
+author:

spec/javascripts/projects/settings_service_desk/components/service_desk_setting_spec.js

@@ -44,10 +44,6 @@ describe('ServiceDeskSetting', () => {
           expect(el.querySelector('.fa-exclamation-circle')).toBeNull();
           expect(vm.$refs['service-desk-incoming-email']).toBeUndefined();
         });
-
-        it('should see warning message', () => {
-          expect(vm.$refs['recommend-protect-email-from-spam-message']).toBeDefined();
-        });
       });
     });