<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/spec/controllers/projects, branch dm-consistent-commit-widget</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>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://git.baserock.org/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://git.baserock.org/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>Respond with 404 when metrics are not enabled or deployment_metrics is not implemented</title>
<updated>2017-05-12T16:16:22+00:00</updated>
<author>
<name>Pawel Chojnacki</name>
<email>pawel@chojnacki.ws</email>
</author>
<published>2017-05-12T16:16:22+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=f38779c6f521e0d554303db0619bafb07ffeda29'/>
<id>f38779c6f521e0d554303db0619bafb07ffeda29</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 'issue_27168_2' into 'master'</title>
<updated>2017-05-09T15:16:31+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@mcgivern.me.uk</email>
</author>
<published>2017-05-09T15:16:31+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=a3607aa43971d03b718e070db271104553eca549'/>
<id>a3607aa43971d03b718e070db271104553eca549</id>
<content type='text'>

Preloads head pipeline for each merge request

Closes #27168

See merge request !10064</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Preloads head pipeline for each merge request

Closes #27168

See merge request !10064</pre>
</div>
</content>
</entry>
<entry>
<title>Merge request widget redesign</title>
<updated>2017-05-09T04:15:34+00:00</updated>
<author>
<name>Fatih Acet</name>
<email>acetfatih@gmail.com</email>
</author>
<published>2017-05-09T04:15:34+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=0151325dacebb99d54b6effb1d5842c0c712168c'/>
<id>0151325dacebb99d54b6effb1d5842c0c712168c</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix specs 2</title>
<updated>2017-05-08T14:29:10+00:00</updated>
<author>
<name>Felipe Artur</name>
<email>felipefac@gmail.com</email>
</author>
<published>2017-03-28T20:04:14+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=d9bebd89dfcf7e4b163b271eea3d7a5c3e99fb5d'/>
<id>d9bebd89dfcf7e4b163b271eea3d7a5c3e99fb5d</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix Specs</title>
<updated>2017-05-08T14:26:04+00:00</updated>
<author>
<name>Felipe Artur</name>
<email>felipefac@gmail.com</email>
</author>
<published>2017-03-22T19:36:14+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=24824cbb4c6d2c5ebd08dea03007f65c5df763da'/>
<id>24824cbb4c6d2c5ebd08dea03007f65c5df763da</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Add Pipeline Schedules that supersedes experimental Trigger Schedule</title>
<updated>2017-05-07T22:35:56+00:00</updated>
<author>
<name>Zeger-Jan van de Weg</name>
<email>zegerjan@gitlab.com</email>
</author>
<published>2017-05-07T22:35:56+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=8df3997a92bffa2d29f3c559933a336b837cdb93'/>
<id>8df3997a92bffa2d29f3c559933a336b837cdb93</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 'feature/gb/manual-actions-protected-branches-permissions' into 'master'</title>
<updated>2017-05-06T17:17:02+00:00</updated>
<author>
<name>Kamil Trzciński</name>
<email>ayufan@ayufan.eu</email>
</author>
<published>2017-05-06T17:17:02+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=6ad3814e1b31bfacfae7a2aabb4e4607b12ca66f'/>
<id>6ad3814e1b31bfacfae7a2aabb4e4607b12ca66f</id>
<content type='text'>

Check access to a branch when user triggers manual action

Closes #20261

See merge request !10494</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Check access to a branch when user triggers manual action

Closes #20261

See merge request !10494</pre>
</div>
</content>
</entry>
<entry>
<title>Real time pipeline show action</title>
<updated>2017-05-06T16:45:46+00:00</updated>
<author>
<name>Zeger-Jan van de Weg</name>
<email>zegerjan@gitlab.com</email>
</author>
<published>2017-05-06T16:45:46+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=c17e6a6c68b0412b3433632802b852db474a7b30'/>
<id>c17e6a6c68b0412b3433632802b852db474a7b30</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
