<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/spec/controllers, 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>Codestyle</title>
<updated>2017-05-13T01:18:57+00:00</updated>
<author>
<name>Gabriel Mazetto</name>
<email>brodock@gmail.com</email>
</author>
<published>2017-05-13T01:18:57+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=44129aceaf6d26ae52834548072a91f6fc62f74b'/>
<id>44129aceaf6d26ae52834548072a91f6fc62f74b</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<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>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 '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>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>Fix redirect message for groups and users</title>
<updated>2017-05-11T22:28:13+00:00</updated>
<author>
<name>Michael Kozono</name>
<email>mkozono@gmail.com</email>
</author>
<published>2017-05-11T20:57:03+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ab98f8b5b1fb323ded965cdb352a504525dd0703'/>
<id>ab98f8b5b1fb323ded965cdb352a504525dd0703</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 '27144-enforce-rubocop-trailing_commas-no_comma-style' into 'master'</title>
<updated>2017-05-10T21:43:34+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2017-05-10T21:43:34+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=cb2f739d4844af094f62edb4e4dff1b3413a405b'/>
<id>cb2f739d4844af094f62edb4e4dff1b3413a405b</id>
<content type='text'>

Resolve "Use consistent style for trailing commas"

Closes #27144

See merge request !11063</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Resolve "Use consistent style for trailing commas"

Closes #27144

See merge request !11063</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://git.baserock.org/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>Merge branch 'tc-fix-private-subgroups-shown' into 'security'</title>
<updated>2017-05-10T14:48:18+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2017-05-03T23:51:25+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ea4eb460479a24fea9ee890c8ba8f6f4dec7f44b'/>
<id>ea4eb460479a24fea9ee890c8ba8f6f4dec7f44b</id>
<content type='text'>

Use GroupsFinder to find subgroups the user has access to

See merge request !2096</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Use GroupsFinder to find subgroups the user has access to

See merge request !2096</pre>
</div>
</content>
</entry>
</feed>
