summaryrefslogtreecommitdiff
path: root/app/mailers
Commit message (Collapse)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@12-10-stable-eeGitLab Bot2020-04-202-0/+18
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-04-141-0/+11
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-03-201-0/+13
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-02-272-0/+8
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-02-171-1/+7
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-01-275-5/+5
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-01-231-9/+7
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-01-092-3/+3
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-12-101-1/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-12-101-0/+12
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-12-061-0/+2
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-11-124-19/+37
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-10-172-0/+29
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-308-33/+26
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-271-2/+2
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-131-1/+5
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-135-0/+10
|
* Add X-GitLab-NotificationReason header to note emailsadd-notification-reason-to-note-emailsSean McGivern2019-09-021-12/+13
| | | | | | The 'assigned' reason doesn't apply to notes, but the other two can ('mentioned' and 'own_activity'), so we can still use this for note emails.
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2019-08-291-0/+2
|\
| * Merge branch 'security-hide_merge_request_ids_on_emails' into 'master'GitLab Release Tools Bot2019-08-291-0/+2
| |\ | | | | | | | | | | | | Prevent disclosure of merge request id via email See merge request gitlab/gitlabhq!3313
| | * Prevent disclosure of merge request id via emailFelipe Artur2019-08-191-0/+2
| | | | | | | | | | | | | | | Do not disclosure merge request id via email for unauthorized users when closing issues.
* | | Fix issue due notification emails threading66524-issue-due-notification-emails-are-threaded-incorrectlyHeinrich Lee Yu2019-08-291-1/+1
|/ / | | | | | | | | It should not be a start to a new thread but rather a reply to an existing thread
* | Handle namespaced modelsAlex Kalderimis2019-08-211-2/+13
| | | | | | | | | | | | We encountered issues with setting module headers for namespaced models. These changes address this. We retain the namespacing, but transform the classnames to make them into safe email headers.
* | Rework retry strategy for remote mirrorsBob Van Landuyt2019-08-131-1/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Prevention of running 2 simultaneous updates** Instead of using `RemoteMirror#update_status` and raise an error if it's already running to prevent the same mirror being updated at the same time we now use `Gitlab::ExclusiveLease` for that. When we fail to obtain a lease in 3 tries, 30 seconds apart, we bail and reschedule. We'll reschedule faster for the protected branches. If the mirror already ran since it was scheduled, the job will be skipped. **Error handling: Remote side** When an update fails because of a `Gitlab::Git::CommandError`, we won't track this error in sentry, this could be on the remote side: for example when branches have diverged. In this case, we'll try 3 times scheduled 1 or 5 minutes apart. In between, the mirror is marked as "to_retry", the error would be visible to the user when they visit the settings page. After 3 tries we'll mark the mirror as failed and notify the user. We won't track this error in sentry, as it's not likely we can help it. The next event that would trigger a new refresh. **Error handling: our side** If an unexpected error occurs, we mark the mirror as failed, but we'd still retry the job based on the regular sidekiq retries with backoff. Same as we used to The error would be reported in sentry, since its likely we need to do something about it.
* Respect alt email when sending group access notifications63568-access-email-notifications-custom-emailMario de la Ossa2019-07-253-13/+24
| | | | | When sending access granted/rejected emails we should also respect custom emails set for groups/sub-groups
* Make pipeline emails respect group email setting63485-fix-pipeline-emails-to-use-group-settingHeinrich Lee Yu2019-07-231-11/+1
| | | | | When a user's notification email is set for a group, we should use that for pipeline emails
* Remove group in notification email subjectHeinrich Lee Yu2019-07-011-2/+2
| | | | | This reverts to previous behavior where we have the group only when we don't have a project
* Fix notes email with group-level notification emailSean McGivern2019-06-241-1/+1
| | | | | A Noteable doesn't have a group directly, unless it's an epic - we need to look for the project's group to find the right email address.
* Omit blocked admins from repository check e-mailssh-omit-blocked-admins-from-notificationStan Hu2019-06-121-1/+1
| | | | | | | Blocked admins should not receive notifications about failed repository checks. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63019
* Apply reviewer suggestionsweimeng-email-routingWei-Meng Lee2019-05-311-1/+1
|
* Move method into groupWei-Meng Lee2019-05-311-1/+1
|
* Guarantee order of notification settingsWei-Meng Lee2019-05-311-10/+2
|
* Move group_notification_email outside conditionalWei-Meng Lee2019-05-311-2/+1
|
* Fix typo in project invitation declined testWei-Meng Lee2019-05-311-1/+1
|
* Send notifications to group-specific email addressWei-Meng Lee2019-05-318-19/+37
| | | | | | - Select notification email by walking up group/subgroup path - Add settings UI to set group email notification address - Add tests
* Include MR information if possible when emailing notification of closing an ↵Michał Zając2019-05-162-5/+6
| | | | issue
* Resolve CE/EE diffs in app/views/layouts viewlayouts-scbLuke Bennett2019-05-111-0/+1
| | | | Part of single codebase changes.
* [CE] Support multiple assignees for merge requestsosw-multi-assignees-merge-requestsOswaldo Ferreira2019-04-082-2/+6
| | | | | Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161 (code out of ee/ folder).
* Merge branch 'merge-dev-to-master' into 'master'John Jarvis2019-03-051-0/+1
|\ | | | | | | | | | | | | Merge dev.gitlab.org master into GitLab.com master Closes #2794, #2814, #2806, #2805, #2798, #2795, #2788, and #2787 See merge request gitlab-org/gitlab-ce!25746
| * Merge dev master into GitLab.com masterYorick Peterse2019-03-041-0/+1
| |\
| | * Remove link after issue move when no permissionsJarka Košanová2019-02-201-0/+1
| | | | | | | | | | | | | | | | | | Don't show new issue link after move when a user does not have permissions to display the new issue
* | | Rename ambiguous association names in Ci::PipelineShinya Maeda2019-03-051-1/+1
|/ / | | | | | | | | | | | | | | fix it ok Fix head pipeline
* | Show header and footer system messages in emailAlexandru Croitor2019-02-273-0/+12
|/ | | | | | | | | | | * 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
* Import CSV BackendHeinrich Lee Yu2019-01-072-0/+15
| | | | Process CSV uploads async using a worker then email results
* Add date range to milestone changed emailsHeinrich Lee Yu2018-12-213-2/+7
| | | | Also refactored issues and MRs to use the same email template file
* Add List-Id to notification emailsOlivier Crête2018-12-131-0/+2
|
* Merge branch ↵Nick Thomas2018-12-123-0/+21
|\ | | | | | | | | | | | | | | | | '54650-send-an-email-to-project-owners-when-a-mirror-update-fails' into 'master' Send a notification email on mirror update errors Closes #54650 See merge request gitlab-org/gitlab-ce!23595
| * Send a notification email on mirror update errorsAlejandro Rodríguez2018-12-113-0/+21
| | | | | | | | | | | | The email is sent to project maintainers containing the last mirror update error. This will allow maintainers to set alarms and react accordingly.
* | Fix a potential frozen string error in app/mailers/notify.rbRémy Coutable2018-12-111-2/+2
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Fix a frozen string error in app/mailers/notify.rbRémy Coutable2018-12-101-1/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>