<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git, branch remove-wip</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>Remove CHANGELOG item that was added during merge resolution</title>
<updated>2016-03-18T22:44:21+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-03-18T22:44:21+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=4ce29395049e9ce9c368c5cf4b30a4969d03b42e'/>
<id>4ce29395049e9ce9c368c5cf4b30a4969d03b42e</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/master' into remove-wip</title>
<updated>2016-03-18T22:29:18+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-03-18T22:29:18+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=cafa408b2521aa82d856581eb5d78d98114f1ab2'/>
<id>cafa408b2521aa82d856581eb5d78d98114f1ab2</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Improve the "easy WIP &amp; un-WIP from link" feature</title>
<updated>2016-03-18T22:27:35+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-03-18T22:27:35+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=0b942541da1dc616cea266dc1f4d517fe81f6e5a'/>
<id>0b942541da1dc616cea266dc1f4d517fe81f6e5a</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/14418' into 'master'</title>
<updated>2016-03-18T21:40:46+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-03-18T21:40:46+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=18fc7c66f4455e757593a60e02a6306decef5a47'/>
<id>18fc7c66f4455e757593a60e02a6306decef5a47</id>
<content type='text'>

Dedupe labels in labels selector in Dashboard pages

Fixes #14418.

See merge request !3311</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Dedupe labels in labels selector in Dashboard pages

Fixes #14418.

See merge request !3311</pre>
</div>
</content>
</entry>
<entry>
<title>Dedupe labels in labels selector in Dashboard pages</title>
<updated>2016-03-18T20:49:56+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-03-18T20:49:56+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=733ae58798f6736af156e94b6906ac9c0b76fa3d'/>
<id>733ae58798f6736af156e94b6906ac9c0b76fa3d</id>
<content type='text'>
Also moved useless helper methods and directly to the
DashboardController.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Also moved useless helper methods and directly to the
DashboardController.
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'no-gc-retry' into 'master'</title>
<updated>2016-03-18T20:26:40+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-03-18T20:26:40+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=c790107854658a37d97b9a1c9066338eb12b06bf'/>
<id>c790107854658a37d97b9a1c9066338eb12b06bf</id>
<content type='text'>

Do not retry "git gc"

To prevent 'git gc' timing out on a large repo and then bouncing
around in the retry queue.

See merge request !3266</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Do not retry "git gc"

To prevent 'git gc' timing out on a large repo and then bouncing
around in the retry queue.

See merge request !3266</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'fix/14388' into 'master'</title>
<updated>2016-03-18T19:07:03+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-03-18T19:07:03+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=49534a65963f6bb1bda57230ae9c320037fc176b'/>
<id>49534a65963f6bb1bda57230ae9c320037fc176b</id>
<content type='text'>

Fix an issue when the target branch of a MR had been deleted

Before displaying the "diverged commits" note, we're checking if the MR
is open, but we should check if it's mergeable instead because this
check ensure the source and target branches exist.

This was introduced by !2217 and fixes #14388.

See merge request !3294</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fix an issue when the target branch of a MR had been deleted

Before displaying the "diverged commits" note, we're checking if the MR
is open, but we should check if it's mergeable instead because this
check ensure the source and target branches exist.

This was introduced by !2217 and fixes #14388.

See merge request !3294</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'refactor-ui-lists' into 'master'</title>
<updated>2016-03-18T18:35:19+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2016-03-18T18:35:19+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=5203a98411c5b3418f98b44732ce6af3d38d3a19'/>
<id>5203a98411c5b3418f98b44732ce6af3d38d3a19</id>
<content type='text'>

Refactor colors and lists

* Introduce 2 color links: black and blue
* Use black color link for UI elements like lists
* Refactor lists to use .title nested under li
* Make all lists (events, todos, activity, projects etc) use style
* List colorschema is now 333 for links and 555 for text

Signed-off-by: Dmitriy Zaporozhets &lt;dmitriy.zaporozhets@gmail.com&gt;

cc @jschatz1 @skyruler 

See merge request !3307</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Refactor colors and lists

* Introduce 2 color links: black and blue
* Use black color link for UI elements like lists
* Refactor lists to use .title nested under li
* Make all lists (events, todos, activity, projects etc) use style
* List colorschema is now 333 for links and 555 for text

Signed-off-by: Dmitriy Zaporozhets &lt;dmitriy.zaporozhets@gmail.com&gt;

cc @jschatz1 @skyruler 

See merge request !3307</pre>
</div>
</content>
</entry>
<entry>
<title>Refactor colors and lists</title>
<updated>2016-03-18T18:02:08+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2016-03-18T18:02:08+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=daeed3fdf309771a1c6827ed5b024c2f883bbeb5'/>
<id>daeed3fdf309771a1c6827ed5b024c2f883bbeb5</id>
<content type='text'>
* Introduce 2 color links: black and blue
* Use black color link for UI elements like lists
* Refactor lists to use .title nested under li
* Make all lists (events, todos, activity, projects etc) use style
* List colorschema is now 333 for links and 555 for 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>
* Introduce 2 color links: black and blue
* Use black color link for UI elements like lists
* Refactor lists to use .title nested under li
* Make all lists (events, todos, activity, projects etc) use style
* List colorschema is now 333 for links and 555 for text

Signed-off-by: Dmitriy Zaporozhets &lt;dmitriy.zaporozhets@gmail.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Add a safeguard in MergeRequest#compute_diverged_commits_count</title>
<updated>2016-03-18T18:01:20+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-03-18T17:16:04+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=bc92de8f038012b284ea1cbfbb2f0950943ebd88'/>
<id>bc92de8f038012b284ea1cbfbb2f0950943ebd88</id>
<content type='text'>
We have to ensure source_sha and target_sha are not nil before calling
Gitlab::Git::Commit.between.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
We have to ensure source_sha and target_sha are not nil before calling
Gitlab::Git::Commit.between.
</pre>
</div>
</content>
</entry>
</feed>
