<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/spec/services, branch dm-paste-code-inside-gfm-code</title>
<subtitle>gitlab.com: gitlab-org/gitlab-ce.git
</subtitle>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/'/>
<entry>
<title>Fix: Deleting an invited member causes 500 error</title>
<updated>2017-05-18T13:26:39+00:00</updated>
<author>
<name>Valery Sizov</name>
<email>valery@gitlab.com</email>
</author>
<published>2017-05-18T13:18:26+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ed86faebe1de0d7bb364341f8a36b4aac0757d0c'/>
<id>ed86faebe1de0d7bb364341f8a36b4aac0757d0c</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>[Spec optimization] Joining one-line 'it' blocks</title>
<updated>2017-05-15T09:39:56+00:00</updated>
<author>
<name>Valery Sizov</name>
<email>valery@gitlab.com</email>
</author>
<published>2017-05-15T09:39:56+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=268b1c79e9b25061718215afe0897d952a92a967'/>
<id>268b1c79e9b25061718215afe0897d952a92a967</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 'fix-conflict-resolution-with-corrupt-repos' into 'master'</title>
<updated>2017-05-12T20:37:30+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2017-05-12T20:37:30+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=e4261fe3ce0e6ba38db99323b9fb479c6a182d77'/>
<id>e4261fe3ce0e6ba38db99323b9fb479c6a182d77</id>
<content type='text'>

Fix conflict resolution from corrupted upstream

Closes gitlab-ee#2128

See merge request !11298</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fix conflict resolution from corrupted upstream

Closes gitlab-ee#2128

See merge request !11298</pre>
</div>
</content>
</entry>
<entry>
<title>Fix conflict resolution from corrupted upstream</title>
<updated>2017-05-12T19:47:51+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@gitlab.com</email>
</author>
<published>2017-05-11T15:23:02+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ad2bfeb85756db8c4cea9290be743665efd1c918'/>
<id>ad2bfeb85756db8c4cea9290be743665efd1c918</id>
<content type='text'>
I don't know why this happens exactly, but given an upstream and fork repository
from a customer, both of which required GC, resolving conflicts would corrupt
the fork so badly that it couldn't be cloned.

This isn't a perfect fix for that case, because the MR may still need to be
merged manually, but it does ensure that the repository is at least usable.

My best guess is that when we generate the index for the conflict
resolution (which we previously did in the target project), we obtain a
reference to an OID that doesn't exist in the source, even though we already
fetch the refs from the target into the source.

Explicitly setting the source project as the place to get the merge index from
seems to prevent repository corruption in this way.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
I don't know why this happens exactly, but given an upstream and fork repository
from a customer, both of which required GC, resolving conflicts would corrupt
the fork so badly that it couldn't be cloned.

This isn't a perfect fix for that case, because the MR may still need to be
merged manually, but it does ensure that the repository is at least usable.

My best guess is that when we generate the index for the conflict
resolution (which we previously did in the target project), we obtain a
reference to an OID that doesn't exist in the source, even though we already
fetch the refs from the target into the source.

Explicitly setting the source project as the place to get the merge index from
seems to prevent repository corruption in this way.
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'update_assignee_cache_counts_refactoring' into 'master'</title>
<updated>2017-05-12T12:37:18+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@mcgivern.me.uk</email>
</author>
<published>2017-05-12T12:37:18+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=592263ead99a13513adbee9d1bf041e9098763f2'/>
<id>592263ead99a13513adbee9d1bf041e9098763f2</id>
<content type='text'>

Rework update_assignee_cache_counts

Closes #31873

See merge request !11270</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Rework update_assignee_cache_counts

Closes #31873

See merge request !11270</pre>
</div>
</content>
</entry>
<entry>
<title>Move update_assignee_cache_counts to the service</title>
<updated>2017-05-12T11:12:29+00:00</updated>
<author>
<name>Valery Sizov</name>
<email>valery@gitlab.com</email>
</author>
<published>2017-05-10T20:54:10+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=e2a3a5095abd8c1fa57dd19e4ff693ae4021fde8'/>
<id>e2a3a5095abd8c1fa57dd19e4ff693ae4021fde8</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>fix for Follow-up from "Backport of Multiple Assignees feature</title>
<updated>2017-05-11T16:11:49+00:00</updated>
<author>
<name>Valery Sizov</name>
<email>valery@gitlab.com</email>
</author>
<published>2017-05-08T14:58:42+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=22722659c233efb3b65bb35286ff07c192e3fc85'/>
<id>22722659c233efb3b65bb35286ff07c192e3fc85</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 'retried-in-database-mysql' into 'master'</title>
<updated>2017-05-10T22:07:05+00:00</updated>
<author>
<name>Regis Boudinot</name>
<email>boudinot.regis@yahoo.com</email>
</author>
<published>2017-05-10T22:07:05+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=81df0034f4b66f2627ecd92f0ca44b7a3a634719'/>
<id>81df0034f4b66f2627ecd92f0ca44b7a3a634719</id>
<content type='text'>

Retried in database

Closes #25737

See merge request !11115</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Retried in database

Closes #25737

See merge request !11115</pre>
</div>
</content>
</entry>
<entry>
<title>Enable the Style/TrailingCommaInArguments cop</title>
<updated>2017-05-10T16:25:45+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2017-05-03T11:27:17+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=3db37e05622aa3daa2be41bb9edc486cd2e54bcd'/>
<id>3db37e05622aa3daa2be41bb9edc486cd2e54bcd</id>
<content type='text'>
Use the EnforcedStyleForMultiline: no_comma option.

Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Use the EnforcedStyleForMultiline: no_comma option.

Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Enable the Style/TrailingCommaInLiteral cop</title>
<updated>2017-05-10T16:25:45+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2017-05-03T11:22:03+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=d40e1f547ea9e31e822229bb808aaa6b9201f473'/>
<id>d40e1f547ea9e31e822229bb808aaa6b9201f473</id>
<content type='text'>
Use the EnforcedStyleForMultiline: no_comma option.

Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Use the EnforcedStyleForMultiline: no_comma option.

Signed-off-by: Rémy Coutable &lt;remy@rymai.me&gt;
</pre>
</div>
</content>
</entry>
</feed>
