1. 04 Apr, 2019 1 commit
  2. 05 Mar, 2019 1 commit
  3. 27 Feb, 2019 1 commit
    • Alexandru Croitor's avatar
      Show header and footer system messages in email · 77985826
      Alexandru Croitor authored
      * Add email_header_and_footer_enabled flag to appearances table
      * Set email_header_and_footer_enabled default value to false
      * Add checkbox to appearance to toggle show header and footer in emails
      * Add email_header_and_footer_enabled to allowed params in controller
      * Add header and footer messages to the html and text email layouts
      * Remove the color styling for emails header and footer
      * Add empty_mailer layout for emails without layout,
      to have the header and footer applied
      77985826
  4. 20 Feb, 2019 1 commit
  5. 31 Jan, 2019 1 commit
  6. 24 Jan, 2019 1 commit
  7. 22 Jan, 2019 1 commit
  8. 07 Jan, 2019 2 commits
  9. 20 Dec, 2018 1 commit
  10. 11 Dec, 2018 1 commit
  11. 10 Dec, 2018 1 commit
  12. 29 Nov, 2018 1 commit
  13. 28 Nov, 2018 1 commit
  14. 06 Sep, 2018 1 commit
  15. 16 Jul, 2018 1 commit
  16. 11 Jul, 2018 1 commit
  17. 09 Jul, 2018 1 commit
  18. 06 Jul, 2018 1 commit
  19. 20 Jun, 2018 1 commit
    • Mark Chao's avatar
      Notify only when unmergeable due to conflict · 5b994b81
      Mark Chao authored
      There is still the edge case when 'no commits' changes to 'conflict'
      would not trigger notification, which we ignore for now.
      
      Calling can_be_merged? can cause exception (e.g. non-UTF8)
      Ignore those by rescueing.
      
      Remove unmergeable_reason as now only conflict is notified
      
      Update spec
      5b994b81
  20. 03 Jun, 2018 2 commits
  21. 31 May, 2018 1 commit
  22. 18 May, 2018 1 commit
  23. 17 May, 2018 2 commits
  24. 07 May, 2018 1 commit
  25. 08 Apr, 2018 1 commit
  26. 04 Apr, 2018 1 commit
    • Eric Eastwood's avatar
      Add custom additonal email text to all emails · a6c7d805
      Eric Eastwood authored
      Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/4474
      
      Conflicts:
      	db/schema.rb
      	ee/app/controllers/ee/admin/application_settings_controller.rb
      	ee/app/helpers/ee/application_settings_helper.rb
      	ee/app/models/ee/application_setting.rb
      	ee/app/models/license.rb
      	ee/app/views/layouts/service_desk.html.haml
      	ee/app/views/notify/approved_merge_request_email.html.haml
      	ee/app/views/notify/service_desk_new_note_email.text.erb
      	ee/app/views/notify/service_desk_thank_you_email.text.erb
      	ee/app/views/notify/unapproved_merge_request_email.html.haml
      	ee/lib/ee/api/entities.rb
      	ee/spec/controllers/admin/application_settings_controller_spec.rb
      	ee/spec/models/application_setting_spec.rb
      	ee/spec/requests/api/settings_spec.rb
      	lib/api/settings.rb
      	spec/mailers/previews/notify_preview.rb
      a6c7d805
  27. 03 Apr, 2018 1 commit
  28. 28 Mar, 2018 1 commit
  29. 05 Mar, 2018 1 commit
  30. 23 Feb, 2018 1 commit
  31. 19 Feb, 2018 1 commit
  32. 31 Jan, 2018 1 commit
  33. 17 Jan, 2018 1 commit
    • Mario de la Ossa's avatar
      Initial work to add notification reason to emails · 23a20c20
      Mario de la Ossa authored
      Adds `#build_notification_recipients` to `NotificationRecipientService`
      that returns the `NotificationRecipient` objects in order to be able to
      access the new attribute `reason`.
      
      This new attribute is used in the different notifier methods in order to
      add the reason as a header: `X-GitLab-NotificationReason`.
      
      Only the reason with the most priority gets sent.
      23a20c20
  34. 22 Dec, 2017 1 commit
  35. 13 Dec, 2017 1 commit
    • Toon Claes's avatar
      Make discussion mail References all notes in the discussion · f55aaca5
      Toon Claes authored
      When a note is part of a discussion, the email sent out will be
      `In-Reply-To` the previous note in that discussion. It also
      `References` all the previous notes in that discussion, and the
      original issue.
      
      Closes gitlab-org/gitlab-ce#36054.
      f55aaca5
  36. 01 Dec, 2017 1 commit
  37. 13 Nov, 2017 1 commit