Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42 | GitLab Bot | 2021-11-18 | 2 | -12/+15 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42 | GitLab Bot | 2021-09-20 | 3 | -17/+42 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42 | GitLab Bot | 2021-08-19 | 4 | -3/+29 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42 | GitLab Bot | 2021-07-20 | 4 | -6/+30 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42 | GitLab Bot | 2021-06-16 | 4 | -17/+33 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42 | GitLab Bot | 2021-05-19 | 9 | -19/+28 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43 | GitLab Bot | 2021-04-20 | 3 | -4/+31 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40 | GitLab Bot | 2021-03-16 | 5 | -10/+31 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42 | GitLab Bot | 2021-02-18 | 4 | -0/+45 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42 | Robert Speicher | 2021-01-20 | 5 | -7/+33 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42 | GitLab Bot | 2020-12-17 | 4 | -10/+19 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42 | GitLab Bot | 2020-11-19 | 6 | -49/+51 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42 | GitLab Bot | 2020-10-21 | 6 | -9/+66 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@13-4-stable-ee | GitLab Bot | 2020-09-19 | 3 | -6/+48 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@13-3-stable-ee | GitLab Bot | 2020-08-20 | 1 | -0/+11 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@13-2-stable-ee | GitLab Bot | 2020-08-05 | 1 | -1/+16 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@13-2-stable-ee | GitLab Bot | 2020-07-20 | 4 | -0/+116 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@13-1-stable-ee | GitLab Bot | 2020-06-18 | 5 | -4/+47 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@13-0-stable-ee | GitLab Bot | 2020-05-20 | 5 | -0/+46 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@12-10-stable-ee | GitLab Bot | 2020-04-20 | 2 | -0/+18 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-04-14 | 1 | -0/+11 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-03-20 | 1 | -0/+13 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-02-27 | 2 | -0/+8 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-02-17 | 1 | -1/+7 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-01-27 | 5 | -5/+5 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-01-23 | 1 | -9/+7 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-01-09 | 2 | -3/+3 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-12-10 | 1 | -1/+1 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-12-10 | 1 | -0/+12 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-12-06 | 1 | -0/+2 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-11-12 | 4 | -19/+37 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-10-17 | 2 | -0/+29 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-09-30 | 8 | -33/+26 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-09-27 | 1 | -2/+2 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-09-13 | 1 | -1/+5 |
| | |||||
* | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-09-13 | 5 | -0/+10 |
| | |||||
* | Add X-GitLab-NotificationReason header to note emailsadd-notification-reason-to-note-emails | Sean McGivern | 2019-09-02 | 1 | -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/gitlabhq | Robert Speicher | 2019-08-29 | 1 | -0/+2 |
|\ | |||||
| * | Merge branch 'security-hide_merge_request_ids_on_emails' into 'master' | GitLab Release Tools Bot | 2019-08-29 | 1 | -0/+2 |
| |\ | | | | | | | | | | | | | Prevent disclosure of merge request id via email See merge request gitlab/gitlabhq!3313 | ||||
| | * | Prevent disclosure of merge request id via email | Felipe Artur | 2019-08-19 | 1 | -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-incorrectly | Heinrich Lee Yu | 2019-08-29 | 1 | -1/+1 |
|/ / | | | | | | | | | It should not be a start to a new thread but rather a reply to an existing thread | ||||
* | | Handle namespaced models | Alex Kalderimis | 2019-08-21 | 1 | -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 mirrors | Bob Van Landuyt | 2019-08-13 | 1 | -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-email | Mario de la Ossa | 2019-07-25 | 3 | -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-setting | Heinrich Lee Yu | 2019-07-23 | 1 | -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 subject | Heinrich Lee Yu | 2019-07-01 | 1 | -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 email | Sean McGivern | 2019-06-24 | 1 | -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-notification | Stan Hu | 2019-06-12 | 1 | -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-routing | Wei-Meng Lee | 2019-05-31 | 1 | -1/+1 |
| | |||||
* | Move method into group | Wei-Meng Lee | 2019-05-31 | 1 | -1/+1 |
| |