<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/spec/models, branch dz-codeclimate-doc</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>Make the new repository_update_events configurable in System Hooks UI</title>
<updated>2017-05-12T22:26:48+00:00</updated>
<author>
<name>Gabriel Mazetto</name>
<email>brodock@gmail.com</email>
</author>
<published>2017-05-05T12:11:28+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=2e97db051ca52d464382df0c84562fbc5e67b956'/>
<id>2e97db051ca52d464382df0c84562fbc5e67b956</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Added repository_update hook</title>
<updated>2017-05-12T22:26:48+00:00</updated>
<author>
<name>Gabriel Mazetto</name>
<email>brodock@gmail.com</email>
</author>
<published>2017-05-03T02:36:13+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=f661980904f718440cc700b7d1f38ea8bf0e5480'/>
<id>f661980904f718440cc700b7d1f38ea8bf0e5480</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://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>Merge branch 'disable-usage-ping' into 'master'</title>
<updated>2017-05-12T19:16:40+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2017-05-12T19:16:40+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b012c0b3164e58b55c9860ea6874b76491669a40'/>
<id>b012c0b3164e58b55c9860ea6874b76491669a40</id>
<content type='text'>
Usage ping updates

Closes #31741 and #31453

See merge request !11231</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Usage ping updates

Closes #31741 and #31453

See merge request !11231</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '27439-performance-deltas' into 'master'</title>
<updated>2017-05-12T17:15:31+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2017-05-12T17:15:31+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=bec9ec9a6e8980d4354f2b577cfd2a96a83a73b7'/>
<id>bec9ec9a6e8980d4354f2b577cfd2a96a83a73b7</id>
<content type='text'>

Expose memory deltas between app deployments and refactor prometheus queries to support more custom queries

See merge request !10981</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Expose memory deltas between app deployments and refactor prometheus queries to support more custom queries

See merge request !10981</pre>
</div>
</content>
</entry>
<entry>
<title>Consistently use monospace font for commit SHAs and branch and tag names</title>
<updated>2017-05-12T14:55:25+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@selenight.nl</email>
</author>
<published>2017-05-11T15:47:44+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ff82acf34319fbcd3598dba7c025715874ba903c'/>
<id>ff82acf34319fbcd3598dba7c025715874ba903c</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 '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://git.baserock.org/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>Merge branch 'protected-branches-no-one-merge' into 'master'</title>
<updated>2017-05-12T12:09:56+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@mcgivern.me.uk</email>
</author>
<published>2017-05-12T12:09:56+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=6e78508cd2021fd2dd69c786f58be15a21748748'/>
<id>6e78508cd2021fd2dd69c786f58be15a21748748</id>
<content type='text'>

Enabled 'no one' as a merge access level in protected branches

Closes #31541

See merge request !11232</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Enabled 'no one' as a merge access level in protected branches

Closes #31541

See merge request !11232</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://git.baserock.org/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>
</feed>
