1. 15 Apr, 2019 1 commit
    • Daniel Gerhardt's avatar
      Fix mail address header formatting for DeviseMailer · 233786ff
      Daniel Gerhardt authored
      `DeviseMailer` did not correctly handle display names set via
      `Gitlab.config.gitlab.email_display_name` if they contained spaces or
      special characters. It has been adjusted to handle addresses in the same
      way `BaseMailer` does.
      233786ff
  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. 07 Jan, 2019 1 commit
  6. 21 Dec, 2018 1 commit
  7. 13 Dec, 2018 1 commit
  8. 12 Dec, 2018 1 commit
  9. 11 Dec, 2018 1 commit
  10. 10 Dec, 2018 1 commit
  11. 06 Dec, 2018 1 commit
  12. 29 Nov, 2018 1 commit
  13. 28 Nov, 2018 1 commit
  14. 02 Nov, 2018 1 commit
  15. 16 Oct, 2018 1 commit
  16. 24 Sep, 2018 1 commit
  17. 21 Sep, 2018 1 commit
  18. 11 Sep, 2018 1 commit
  19. 06 Sep, 2018 1 commit
  20. 15 Aug, 2018 1 commit
  21. 27 Jul, 2018 1 commit
  22. 06 Jul, 2018 2 commits
  23. 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
  24. 18 May, 2018 1 commit
  25. 17 May, 2018 1 commit
  26. 07 May, 2018 1 commit
  27. 26 Apr, 2018 1 commit
  28. 03 Apr, 2018 1 commit
  29. 26 Mar, 2018 2 commits
  30. 07 Mar, 2018 1 commit
  31. 23 Feb, 2018 1 commit
  32. 19 Feb, 2018 1 commit
  33. 02 Feb, 2018 1 commit
  34. 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
  35. 13 Dec, 2017 2 commits
  36. 23 Sep, 2017 1 commit
  37. 31 Aug, 2017 1 commit
    • Sean McGivern's avatar
      `current_application_settings` belongs on `Gitlab::CurrentSettings` · 5883ce95
      Sean McGivern authored
      The initializers including this were doing so at the top level, so every object
      loaded after them had a `current_application_settings` method. However, if
      someone had rack-attack enabled (which was loaded before these initializers), it
      would try to load the API, and fail, because `Gitlab::CurrentSettings` didn't
      have that method.
      
      To fix this:
      
      1. Don't include `Gitlab::CurrentSettings` at the top level. We do not need
         `Object.new.current_application_settings` to work.
      2. Make `Gitlab::CurrentSettings` explicitly `extend self`, as we already use it
         like that in several places.
      3. Change the initializers to use that new form.
      5883ce95