<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/lib, branch counters_cache_invalidation</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 'allow_numeric_values_in_gitlab_ci_yml' into 'master'</title>
<updated>2017-05-15T07:59:45+00:00</updated>
<author>
<name>Kamil Trzciński</name>
<email>ayufan@ayufan.eu</email>
</author>
<published>2017-05-15T07:59:45+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=e261b4b8517ba6d5d5b082f1955836c945fd51fc'/>
<id>e261b4b8517ba6d5d5b082f1955836c945fd51fc</id>
<content type='text'>

Allow numeric values in gitlab-ci.yml

Closes #30017

See merge request !10607</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Allow numeric values in gitlab-ci.yml

Closes #30017

See merge request !10607</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'rename-column-concurrently-defaults' into 'master'</title>
<updated>2017-05-15T07:50:44+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2017-05-15T07:50:44+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ae8511df1312d85745baddec0b54401b36d46126'/>
<id>ae8511df1312d85745baddec0b54401b36d46126</id>
<content type='text'>

Fix adding defaults for concurrent column renames

See merge request !11335</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fix adding defaults for concurrent column renames

See merge request !11335</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'dturner/username' into 'master'</title>
<updated>2017-05-15T07:28:58+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2017-05-15T07:28:58+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=c48554edc24fcdddd4af374ff99f5953a5e672d4'/>
<id>c48554edc24fcdddd4af374ff99f5953a5e672d4</id>
<content type='text'>

add username field to push webhook

Closes #32136

See merge request !11272</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

add username field to push webhook

Closes #32136

See merge request !11272</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'fix/support-commit-deltas-only-for-gitaly' into 'master'</title>
<updated>2017-05-14T20:03:15+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2017-05-14T20:03:15+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=133d2bb40a6c8516a8c8c487f347fa99bd7e907c'/>
<id>133d2bb40a6c8516a8c8c487f347fa99bd7e907c</id>
<content type='text'>

Fetch commit deltas from Gitaly

Closes gitaly#199

See merge request !11122</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fetch commit deltas from Gitaly

Closes gitaly#199

See merge request !11122</pre>
</div>
</content>
</entry>
<entry>
<title>Add support for deltas_only under Gitaly</title>
<updated>2017-05-13T16:27:06+00:00</updated>
<author>
<name>Ahmad Sherif</name>
<email>me@ahmadsherif.com</email>
</author>
<published>2017-05-05T14:55:12+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=99feed6e00e0f012f7e879a710e8b478b6160d2f'/>
<id>99feed6e00e0f012f7e879a710e8b478b6160d2f</id>
<content type='text'>
Closes gitaly#199
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Closes gitaly#199
</pre>
</div>
</content>
</entry>
<entry>
<title>Update SystemHooks API to expose and handle new repository_update_events</title>
<updated>2017-05-12T22:26:48+00:00</updated>
<author>
<name>Gabriel Mazetto</name>
<email>brodock@gmail.com</email>
</author>
<published>2017-05-05T16:00:32+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=cfb4404ef6464ed4780bc7619268287716ae5e73'/>
<id>cfb4404ef6464ed4780bc7619268287716ae5e73</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>Remove trailing comma in dependency linker to satisfy Rubocop</title>
<updated>2017-05-12T21:01:54+00:00</updated>
<author>
<name>Stan Hu</name>
<email>stanhu@gmail.com</email>
</author>
<published>2017-05-12T21:01:54+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=8ae2e6bdbb4e1254fd27dc8112c8b6c5c4015f07'/>
<id>8ae2e6bdbb4e1254fd27dc8112c8b6c5c4015f07</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>
</feed>
