summaryrefslogtreecommitdiff
path: root/app/mailers/emails
Commit message (Collapse)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42GitLab Bot2021-11-182-12/+15
|
* Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42GitLab Bot2021-09-203-17/+42
|
* Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42GitLab Bot2021-08-193-2/+28
|
* Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42GitLab Bot2021-07-203-6/+29
|
* Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42GitLab Bot2021-06-163-16/+32
|
* Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42GitLab Bot2021-05-197-16/+21
|
* Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43GitLab Bot2021-04-202-2/+29
|
* Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40GitLab Bot2021-03-164-8/+17
|
* Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42GitLab Bot2021-02-183-0/+43
|
* Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42Robert Speicher2021-01-204-6/+32
|
* Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42GitLab Bot2020-12-174-10/+19
|
* Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42GitLab Bot2020-11-194-49/+43
|
* Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42GitLab Bot2020-10-214-7/+62
|
* Add latest changes from gitlab-org/gitlab@13-4-stable-eeGitLab Bot2020-09-192-6/+44
|
* Add latest changes from gitlab-org/gitlab@13-3-stable-eeGitLab Bot2020-08-201-0/+11
|
* Add latest changes from gitlab-org/gitlab@13-2-stable-eeGitLab Bot2020-08-051-1/+16
|
* Add latest changes from gitlab-org/gitlab@13-2-stable-eeGitLab Bot2020-07-202-0/+99
|
* Add latest changes from gitlab-org/gitlab@13-1-stable-eeGitLab Bot2020-06-183-2/+44
|
* Add latest changes from gitlab-org/gitlab@13-0-stable-eeGitLab Bot2020-05-203-0/+41
|
* Add latest changes from gitlab-org/gitlab@12-10-stable-eeGitLab Bot2020-04-201-0/+14
|
* 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-271-0/+4
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-02-171-1/+7
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-01-231-9/+7
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-01-091-1/+1
|
* 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-123-16/+34
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-10-171-0/+28
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-307-19/+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-133-0/+6
|
* 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
* | 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-251-7/+10
| | | | | When sending access granted/rejected emails we should also respect custom emails set for groups/sub-groups
* 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.
* Fix typo in project invitation declined testWei-Meng Lee2019-05-311-1/+1
|
* Send notifications to group-specific email addressWei-Meng Lee2019-05-317-16/+15
| | | | | | - 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
* [CE] Support multiple assignees for merge requestsosw-multi-assignees-merge-requestsOswaldo Ferreira2019-04-081-2/+4
| | | | | 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
| * 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