<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/app/mailers/emails, branch document-lambda-deploy</title>
<subtitle>gitlab.com: gitlab-org/gitlab-ce.git
</subtitle>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/'/>
<entry>
<title>Add X-GitLab-NotificationReason header to note emails</title>
<updated>2019-09-02T17:15:24+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@gitlab.com</email>
</author>
<published>2019-08-29T19:20:03+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=075f6d3559f0a0127fb322b40fad7985df621fcd'/>
<id>075f6d3559f0a0127fb322b40fad7985df621fcd</id>
<content type='text'>
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.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
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.
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq</title>
<updated>2019-08-29T22:17:37+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>rspeicher@gmail.com</email>
</author>
<published>2019-08-29T22:17:37+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=7698d405506bc10dfd7fb2e6e02b419dd5925725'/>
<id>7698d405506bc10dfd7fb2e6e02b419dd5925725</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'security-hide_merge_request_ids_on_emails' into 'master'</title>
<updated>2019-08-29T21:34:02+00:00</updated>
<author>
<name>GitLab Release Tools Bot</name>
<email>robert+release-tools@gitlab.com</email>
</author>
<published>2019-08-29T21:34:02+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=53661b1035c04b3bfe03751d4f82b060734a4fd6'/>
<id>53661b1035c04b3bfe03751d4f82b060734a4fd6</id>
<content type='text'>
Prevent disclosure of merge request id via email

See merge request gitlab/gitlabhq!3313</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Prevent disclosure of merge request id via email

See merge request gitlab/gitlabhq!3313</pre>
</div>
</content>
</entry>
<entry>
<title>Fix issue due notification emails threading</title>
<updated>2019-08-29T01:41:57+00:00</updated>
<author>
<name>Heinrich Lee Yu</name>
<email>heinrich@gitlab.com</email>
</author>
<published>2019-08-28T08:17:41+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=55d0df7a9f106687a2a252cf70b403bfebb9942c'/>
<id>55d0df7a9f106687a2a252cf70b403bfebb9942c</id>
<content type='text'>
It should not be a start to a new thread but rather
a reply to an existing thread
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
It should not be a start to a new thread but rather
a reply to an existing thread
</pre>
</div>
</content>
</entry>
<entry>
<title>Prevent disclosure of merge request id via email</title>
<updated>2019-08-19T14:51:55+00:00</updated>
<author>
<name>Felipe Artur</name>
<email>felipefac@gmail.com</email>
</author>
<published>2019-08-08T19:29:45+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=fb93142488cfb79bac45f184b7945018550bf326'/>
<id>fb93142488cfb79bac45f184b7945018550bf326</id>
<content type='text'>
Do not disclosure merge request id via email for unauthorized users
when closing issues.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Do not disclosure merge request id via email for unauthorized users
when closing issues.
</pre>
</div>
</content>
</entry>
<entry>
<title>Rework retry strategy for remote mirrors</title>
<updated>2019-08-13T20:52:01+00:00</updated>
<author>
<name>Bob Van Landuyt</name>
<email>bob@gitlab.com</email>
</author>
<published>2019-08-13T20:52:01+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=452bc36d603ed89d3fa5e3409338dd905230bd2f'/>
<id>452bc36d603ed89d3fa5e3409338dd905230bd2f</id>
<content type='text'>
**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.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
**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.
</pre>
</div>
</content>
</entry>
<entry>
<title>Respect alt email when sending group access notifications</title>
<updated>2019-07-26T03:09:25+00:00</updated>
<author>
<name>Mario de la Ossa</name>
<email>mariodelaossa@gmail.com</email>
</author>
<published>2019-07-24T03:36:07+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=10a42a8a76c281fad735f89cb3c37caf2acd6e04'/>
<id>10a42a8a76c281fad735f89cb3c37caf2acd6e04</id>
<content type='text'>
When sending access granted/rejected emails we should also respect
custom emails set for groups/sub-groups
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
When sending access granted/rejected emails we should also respect
custom emails set for groups/sub-groups
</pre>
</div>
</content>
</entry>
<entry>
<title>Remove group in notification email subject</title>
<updated>2019-07-01T08:23:11+00:00</updated>
<author>
<name>Heinrich Lee Yu</name>
<email>heinrich@gitlab.com</email>
</author>
<published>2019-07-01T08:23:11+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=eec2c480130b4faea3446e366f77221fa3f982f0'/>
<id>eec2c480130b4faea3446e366f77221fa3f982f0</id>
<content type='text'>
This reverts to previous behavior where we have the group only when
we don't have a project
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This reverts to previous behavior where we have the group only when
we don't have a project
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix notes email with group-level notification email</title>
<updated>2019-06-24T09:20:10+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@gitlab.com</email>
</author>
<published>2019-06-24T09:20:10+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=e6532ca203a9f29294ebbc854e7c6372f76799dd'/>
<id>e6532ca203a9f29294ebbc854e7c6372f76799dd</id>
<content type='text'>
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.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
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.
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix typo in project invitation declined test</title>
<updated>2019-05-31T12:49:27+00:00</updated>
<author>
<name>Wei-Meng Lee</name>
<email>wlee@gitlab.com</email>
</author>
<published>2019-04-03T09:04:14+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=11fb4d4209cdb31cbcd64a9ec057a90cd2e63618'/>
<id>11fb4d4209cdb31cbcd64a9ec057a90cd2e63618</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
