<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/spec/presenters, branch fix-missing-function-dropzone-input</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>Display issue state in issue links section of merge request widget</title>
<updated>2017-06-09T08:21:56+00:00</updated>
<author>
<name>Adam Niedzielski</name>
<email>adamsunday@gmail.com</email>
</author>
<published>2017-06-08T16:09:04+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=4bfd06e60e22a8100eddc2391d4842a8b6e53a6f'/>
<id>4bfd06e60e22a8100eddc2391d4842a8b6e53a6f</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 '3191-deploy-keys-update' into 'master'</title>
<updated>2017-06-07T14:37:50+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2017-06-07T14:37:50+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ee0e3ffc057d9a033dab3fcc9025e71a6e76bc74'/>
<id>ee0e3ffc057d9a033dab3fcc9025e71a6e76bc74</id>
<content type='text'>
Implement ability to update deploy keys

Closes #3191

See merge request !10383</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Implement ability to update deploy keys

Closes #3191

See merge request !10383</pre>
</div>
</content>
</entry>
<entry>
<title>Implement ability to update deploy keys</title>
<updated>2017-06-02T16:44:36+00:00</updated>
<author>
<name>Alexander Randa</name>
<email>randa.alex@gmail.com</email>
</author>
<published>2017-03-31T12:54:38+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=3d70eeb5bb9dac8073a149547dc3b85c90d65e7d'/>
<id>3d70eeb5bb9dac8073a149547dc3b85c90d65e7d</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Add Conversational Development Index page to admin panel</title>
<updated>2017-06-01T15:37:21+00:00</updated>
<author>
<name>Taurie Davis, Simon Knox and Adam Niedzielski</name>
<email>awesome@gitlab.com</email>
</author>
<published>2017-05-24T10:25:44+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=26dde5f55f1dac2e6bea4f7e1dfa51c72dc756cb'/>
<id>26dde5f55f1dac2e6bea4f7e1dfa51c72dc756cb</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</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 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://91.123.203.49/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>Add missing tests and update test description</title>
<updated>2017-04-06T13:53:02+00:00</updated>
<author>
<name>Lin Jen-Shin</name>
<email>godfat@godfat.org</email>
</author>
<published>2017-04-06T13:53:02+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=1bed2c87e92ca1f42d4e94fbd1e83b392e7736e7'/>
<id>1bed2c87e92ca1f42d4e94fbd1e83b392e7736e7</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Also track auto-cancelling in jobs, detail:</title>
<updated>2017-04-06T13:32:56+00:00</updated>
<author>
<name>Lin Jen-Shin</name>
<email>godfat@godfat.org</email>
</author>
<published>2017-04-06T13:32:56+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=057c0d7a5c062f3030bcc46614ef2442009002de'/>
<id>057c0d7a5c062f3030bcc46614ef2442009002de</id>
<content type='text'>
Not only tracking auto-cancelling in pipelines,
we'll also track this in jobs because pipelines
could be retried and the information would get lost
when this happened. Also erase auto-cancelling
relation for pipelines when they're retried.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Not only tracking auto-cancelling in pipelines,
we'll also track this in jobs because pipelines
could be retried and the information would get lost
when this happened. Also erase auto-cancelling
relation for pipelines when they're retried.
</pre>
</div>
</content>
</entry>
<entry>
<title>Add test for presenters</title>
<updated>2017-04-05T19:10:52+00:00</updated>
<author>
<name>Lin Jen-Shin</name>
<email>godfat@godfat.org</email>
</author>
<published>2017-04-05T19:10:52+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=e258e6f1471fb176e39daf6fef7785af120c2178'/>
<id>e258e6f1471fb176e39daf6fef7785af120c2178</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Added test case for the avaiable project keys</title>
<updated>2017-03-06T20:42:04+00:00</updated>
<author>
<name>Jose Ivan Vargas</name>
<email>jvargas@gitlab.com</email>
</author>
<published>2017-03-06T20:42:04+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=002d3a3e72de57c76a077ed5d09e857243c7effd'/>
<id>002d3a3e72de57c76a077ed5d09e857243c7effd</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
