<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/spec/services, branch user-inline-scripts</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>Repair Regression caused by - !11573</title>
<updated>2017-07-11T06:23:51+00:00</updated>
<author>
<name>Paul Charlton</name>
<email>techguru@byiq.com</email>
</author>
<published>2017-07-11T06:23:51+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=65eca13f7b6a93b54267f82e4c66a5f9bab69dc1'/>
<id>65eca13f7b6a93b54267f82e4c66a5f9bab69dc1</id>
<content type='text'>
some changes introduced by 4daa6da5407d235cbe4f7a787eaa29304446a870, 26b6e299e1c97b956306572c5c9f6c02f428bfd7, 17898ce021fc365c620d4600df68c3e7d2151619 were regressed during today's merge conflict resolution of !11573.

This commit serves to reapply those changes.

/cc: @rspeicher @stanhu @mikegreiling
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
some changes introduced by 4daa6da5407d235cbe4f7a787eaa29304446a870, 26b6e299e1c97b956306572c5c9f6c02f428bfd7, 17898ce021fc365c620d4600df68c3e7d2151619 were regressed during today's merge conflict resolution of !11573.

This commit serves to reapply those changes.

/cc: @rspeicher @stanhu @mikegreiling
</pre>
</div>
</content>
</entry>
<entry>
<title>Support multiple Redis instances based on queue type</title>
<updated>2017-07-11T03:35:47+00:00</updated>
<author>
<name>Paul Charlton</name>
<email>techguru@byiq.com</email>
</author>
<published>2017-07-11T03:35:47+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=cb3b4a15e6913bc28ee2ecaab017a4c3f08c438e'/>
<id>cb3b4a15e6913bc28ee2ecaab017a4c3f08c438e</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix milestones destroy service</title>
<updated>2017-07-10T17:59:34+00:00</updated>
<author>
<name>Felipe Artur</name>
<email>felipefac@gmail.com</email>
</author>
<published>2017-07-10T17:57:16+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=0f7cb967839c6b939f6a8ce8d15c6925acb41031'/>
<id>0f7cb967839c6b939f6a8ce8d15c6925acb41031</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 'dm-fix-project-path-helpers-production' into 'master'</title>
<updated>2017-07-07T18:37:04+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2017-07-07T18:37:04+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=426271dacbb3b7462e4f7a78fa3628bbd267609a'/>
<id>426271dacbb3b7462e4f7a78fa3628bbd267609a</id>
<content type='text'>
Include new URL helpers retroactively into includers of Gitlab::Routing

Closes #34821

See merge request !12716</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Include new URL helpers retroactively into includers of Gitlab::Routing

Closes #34821

See merge request !12716</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'fix-mrs-merged-immediately' into 'master'</title>
<updated>2017-07-07T17:14:04+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2017-07-07T17:14:04+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=5550cba09272c6406845b2972064e0aba1d51884'/>
<id>5550cba09272c6406845b2972064e0aba1d51884</id>
<content type='text'>
Don't mark empty MRs as merged on push to the target branch

Closes #32800

See merge request !12711</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Don't mark empty MRs as merged on push to the target branch

Closes #32800

See merge request !12711</pre>
</div>
</content>
</entry>
<entry>
<title>Include new URL helpers retroactively into includers of Gitlab::Routing</title>
<updated>2017-07-07T15:43:37+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@selenight.nl</email>
</author>
<published>2017-07-07T15:43:37+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=c81928cfa757b6f42debd6d1c3b6cdb860fc14f5'/>
<id>c81928cfa757b6f42debd6d1c3b6cdb860fc14f5</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Native group milestones</title>
<updated>2017-07-07T15:08:49+00:00</updated>
<author>
<name>Felipe Artur</name>
<email>fcardozo@gitlab.com</email>
</author>
<published>2017-07-07T15:08:49+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b5f596c3ffb655b6e4fee127fa9336c829198b5b'/>
<id>b5f596c3ffb655b6e4fee127fa9336c829198b5b</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Don't mark empty MRs as merged on push to the target branch</title>
<updated>2017-07-07T14:34:33+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@gitlab.com</email>
</author>
<published>2017-07-07T14:09:29+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=4209b647f87d99b21aebcc9f311e8214c2658136'/>
<id>4209b647f87d99b21aebcc9f311e8214c2658136</id>
<content type='text'>
When we push to an MR's target branch, we check if the MR's HEAD commit is
contained in the push. This lets us mark MRs as merged if they were merged
manually.

However, we also added a feature where you can create an empty MR from an
issue. If that MR is created around the time of a merge to the default branch,
we would process the push after creating the MR, and consider it to be a manual
merge.

To fix that, we exclude empty MRs from this process. If they are empty, they
were empty before the push we're processing, so we shouldn't touch them!
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
When we push to an MR's target branch, we check if the MR's HEAD commit is
contained in the push. This lets us mark MRs as merged if they were merged
manually.

However, we also added a feature where you can create an empty MR from an
issue. If that MR is created around the time of a merge to the default branch,
we would process the push after creating the MR, and consider it to be a manual
merge.

To fix that, we exclude empty MRs from this process. If they are empty, they
were empty before the push we're processing, so we shouldn't touch them!
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'bvl-backport-board-issue-create-service' into 'master'</title>
<updated>2017-07-07T14:29:43+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2017-07-07T14:29:43+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=dd180944e6fb08ca1bc6ac619128901270e47e46'/>
<id>dd180944e6fb08ca1bc6ac619128901270e47e46</id>
<content type='text'>
This makes the `Boards::CreateService` more reusable for EE

See merge request !12704</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This makes the `Boards::CreateService` more reusable for EE

See merge request !12704</pre>
</div>
</content>
</entry>
<entry>
<title>This makes the `Boards::CreateService` more reusable for EE</title>
<updated>2017-07-07T09:50:01+00:00</updated>
<author>
<name>Bob Van Landuyt</name>
<email>bob@vanlanduyt.co</email>
</author>
<published>2017-07-07T09:50:01+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=c478202ebfa06fdd4ecbafbba285f98d2aa08d60'/>
<id>c478202ebfa06fdd4ecbafbba285f98d2aa08d60</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
