<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/spec, branch tutorials_git_tricks</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>Merge branch 'fix-test' into 'master'</title>
<updated>2016-02-04T16:39:44+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2016-02-04T16:39:44+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=c5ed929d33981d4af25c701087a4eaca1348cc1b'/>
<id>c5ed929d33981d4af25c701087a4eaca1348cc1b</id>
<content type='text'>

Fix broken tests

Signed-off-by: Dmitriy Zaporozhets &lt;dmitriy.zaporozhets@gmail.com&gt;

cc @DouweM 

See merge request !2708</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fix broken tests

Signed-off-by: Dmitriy Zaporozhets &lt;dmitriy.zaporozhets@gmail.com&gt;

cc @DouweM 

See merge request !2708</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'fix/atom-url-issue' into 'master'</title>
<updated>2016-02-04T16:12:47+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-02-04T16:12:47+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ac923b4fb40da88d6c7907d08d4584d5d4a560e2'/>
<id>ac923b4fb40da88d6c7907d08d4584d5d4a560e2</id>
<content type='text'>

Fix atom url issue on projects

This MR adds prevents a project to have a path ending in .atom that conflicts with the feed

and 

Adds a migration to migrate old .atom projects to a different path

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3699

See merge request !2651</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fix atom url issue on projects

This MR adds prevents a project to have a path ending in .atom that conflicts with the feed

and 

Adds a migration to migrate old .atom projects to a different path

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3699

See merge request !2651</pre>
</div>
</content>
</entry>
<entry>
<title>Fix broken tests</title>
<updated>2016-02-04T16:00:32+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2016-02-04T16:00:32+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=9f86fcde400de28fb544e59247b8925e4ff4d09a'/>
<id>9f86fcde400de28fb544e59247b8925e4ff4d09a</id>
<content type='text'>
Signed-off-by: Dmitriy Zaporozhets &lt;dmitriy.zaporozhets@gmail.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Signed-off-by: Dmitriy Zaporozhets &lt;dmitriy.zaporozhets@gmail.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/rs-database-info'</title>
<updated>2016-02-04T15:42:22+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2016-02-04T15:42:22+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=dfe12649f64bcac76b270a96be04285bbe0c2aa2'/>
<id>dfe12649f64bcac76b270a96be04285bbe0c2aa2</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>refactored migration and spec based on feedback</title>
<updated>2016-02-04T12:20:55+00:00</updated>
<author>
<name>James Lopez</name>
<email>james@jameslopez.es</email>
</author>
<published>2016-02-04T12:20:55+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=7b868c61ab371fc9319e6dd1baa2c089bc275618'/>
<id>7b868c61ab371fc9319e6dd1baa2c089bc275618</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 'disable-remove-source-branch' into 'master'</title>
<updated>2016-02-04T11:56:58+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-02-04T11:56:58+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b5befc734be55a4a7a07519baf03e0ba29c0f8c5'/>
<id>b5befc734be55a4a7a07519baf03e0ba29c0f8c5</id>
<content type='text'>

Hide remove source branch button when new commit is added to branch

Fixes #3339

This MR hides the 'Remove source branch' button when a new commit is added to the source branch

/cc @DouweM

See merge request !2701</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Hide remove source branch button when new commit is added to branch

Fixes #3339

This MR hides the 'Remove source branch' button when a new commit is added to the source branch

/cc @DouweM

See merge request !2701</pre>
</div>
</content>
</entry>
<entry>
<title>Hide remove source branch button when new commit is added to branch</title>
<updated>2016-02-04T10:56:23+00:00</updated>
<author>
<name>Zeger-Jan van de Weg</name>
<email>mail@zjvandeweg.nl</email>
</author>
<published>2016-02-04T10:51:12+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=c6e0228ca9937b10ad8e2620501d4fe221108d9a'/>
<id>c6e0228ca9937b10ad8e2620501d4fe221108d9a</id>
<content type='text'>
Fixes #3339

This MR hides the 'Remove source branch' button when a new commit is added to the source branch
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Fixes #3339

This MR hides the 'Remove source branch' button when a new commit is added to the source branch
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'rs-whitelist-in-pipeline' into 'master'</title>
<updated>2016-02-04T10:16:48+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-02-04T10:16:48+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=312d3faf6f71e4dc7fc2870ea823115475f14c8b'/>
<id>312d3faf6f71e4dc7fc2870ea823115475f14c8b</id>
<content type='text'>

Make Pipelines responsible for defining their custom whitelist

This allows for future pipelines to more easily define a custom
whitelist.

See merge request !2693</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Make Pipelines responsible for defining their custom whitelist

This allows for future pipelines to more easily define a custom
whitelist.

See merge request !2693</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'wipMergeSpacing' into 'master'</title>
<updated>2016-02-04T09:49:54+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-02-04T09:49:54+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=a1fa973123796ce27559063a644f093539107a7f'/>
<id>a1fa973123796ce27559063a644f093539107a7f</id>
<content type='text'>

No space required after WIP identifier

Fixes #2426 

Currently, the WIP: (or any other variation) prefix of a merge request title must include a trailing space for it to be recognized as a work in progress and prevent merging. 
To resolve this, I added an or pattern to the regexp to look for any one of the three possible delimiters ':', ']', or ' '. This way the trailing space isn't required but it still won't mark any titles beginning with wip as work in progress (e.g. "Wipwap").

See merge request !1876</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

No space required after WIP identifier

Fixes #2426 

Currently, the WIP: (or any other variation) prefix of a merge request title must include a trailing space for it to be recognized as a work in progress and prevent merging. 
To resolve this, I added an or pattern to the regexp to look for any one of the three possible delimiters ':', ']', or ' '. This way the trailing space isn't required but it still won't mark any titles beginning with wip as work in progress (e.g. "Wipwap").

See merge request !1876</pre>
</div>
</content>
</entry>
<entry>
<title>Make Pipelines responsible for defining their custom whitelist</title>
<updated>2016-02-03T22:24:08+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>rspeicher@gmail.com</email>
</author>
<published>2016-02-03T22:19:54+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=47982e50c4038ed6e56b1dd28b4d4888b33460eb'/>
<id>47982e50c4038ed6e56b1dd28b4d4888b33460eb</id>
<content type='text'>
This allows for future pipelines to more easily define a custom
whitelist.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This allows for future pipelines to more easily define a custom
whitelist.
</pre>
</div>
</content>
</entry>
</feed>
