<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/Gemfile, branch api-internal-errors</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>Add sidetiq dependency</title>
<updated>2015-03-21T15:34:33+00:00</updated>
<author>
<name>Vinnie Okada</name>
<email>vokada@mrvinn.com</email>
</author>
<published>2015-03-21T15:34:33+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=c5b5c2e7a5872e0e4e02fbb11abed2c58bebda45'/>
<id>c5b5c2e7a5872e0e4e02fbb11abed2c58bebda45</id>
<content type='text'>
Add the sidetiq gem to the Gemfile to match EE.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Add the sidetiq gem to the Gemfile to match EE.
</pre>
</div>
</content>
</entry>
<entry>
<title>gollum-lib update</title>
<updated>2015-03-20T13:15:56+00:00</updated>
<author>
<name>Valery Sizov</name>
<email>vsv2711@gmail.com</email>
</author>
<published>2015-03-20T13:15:56+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=484524e0968e168183a8e22599e062d29d1d81fe'/>
<id>484524e0968e168183a8e22599e062d29d1d81fe</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>update doorkeeper to 2.1.3</title>
<updated>2015-03-20T13:13:38+00:00</updated>
<author>
<name>Valery Sizov</name>
<email>vsv2711@gmail.com</email>
</author>
<published>2015-03-20T12:47:19+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=5df1609c82483f6477b2174c216e540417a465cb'/>
<id>5df1609c82483f6477b2174c216e540417a465cb</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 'revert-unicorn-timeout' into 'master'</title>
<updated>2015-03-20T02:01:38+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dzaporozhets@gitlab.com</email>
</author>
<published>2015-03-20T02:01:38+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b99221e6f076972aafd5967bf2421141b735b065'/>
<id>b99221e6f076972aafd5967bf2421141b735b065</id>
<content type='text'>
Revert "Increase timeout for Git-over-HTTP requests."

This reverts commit 516bcabbf42d60db2ac989dce4c7187b2a1e5de9.

For #2164

cc @marin @douwe

See merge request !1730
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Revert "Increase timeout for Git-over-HTTP requests."

This reverts commit 516bcabbf42d60db2ac989dce4c7187b2a1e5de9.

For #2164

cc @marin @douwe

See merge request !1730
</pre>
</div>
</content>
</entry>
<entry>
<title>Revert "Update poltergeist to support phantomjs 2.0"</title>
<updated>2015-03-20T01:56:05+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2015-03-20T01:56:05+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=d5a259d43ecf6713b443da25b2d765580b8f7e42'/>
<id>d5a259d43ecf6713b443da25b2d765580b8f7e42</id>
<content type='text'>
This reverts commit d70126c1fbc65c4feeea6fb45424f5d4a30bb797.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This reverts commit d70126c1fbc65c4feeea6fb45424f5d4a30bb797.
</pre>
</div>
</content>
</entry>
<entry>
<title>Revert "Increase timeout for Git-over-HTTP requests."</title>
<updated>2015-03-20T01:29:20+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2015-03-20T00:57:37+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=efd8491d4906d190abc5e190a2111c04b01b729b'/>
<id>efd8491d4906d190abc5e190a2111c04b01b729b</id>
<content type='text'>
This reverts commit 516bcabbf42d60db2ac989dce4c7187b2a1e5de9.

Conflicts:
	Gemfile
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This reverts commit 516bcabbf42d60db2ac989dce4c7187b2a1e5de9.

Conflicts:
	Gemfile
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'version-bump-poltergeist' into 'master'</title>
<updated>2015-03-19T21:12:08+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2015-03-19T21:12:08+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=012411817b277e0115378288150c1044fb712741'/>
<id>012411817b277e0115378288150c1044fb712741</id>
<content type='text'>
Update poltergeist to support phantomjs 2.0

In response to [my issue](https://gitlab.com/gitlab-org/gitlab-development-kit/issues/36) on the GDK.
PhantomJS 1.8 was not in the repo's anymore. Only poltergeist needed it, but they support PhantomJS 2.0 since 1.6.0. (next release since 1.5.1) [Their CHANGELOG](https://github.com/teampoltergeist/poltergeist/blob/master/CHANGELOG.md).

Tested locally with Ruby 2.1.5. As this took ages, I haven't tested further.

See merge request !403
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Update poltergeist to support phantomjs 2.0

In response to [my issue](https://gitlab.com/gitlab-org/gitlab-development-kit/issues/36) on the GDK.
PhantomJS 1.8 was not in the repo's anymore. Only poltergeist needed it, but they support PhantomJS 2.0 since 1.6.0. (next release since 1.5.1) [Their CHANGELOG](https://github.com/teampoltergeist/poltergeist/blob/master/CHANGELOG.md).

Tested locally with Ruby 2.1.5. As this took ages, I haven't tested further.

See merge request !403
</pre>
</div>
</content>
</entry>
<entry>
<title>Update poltergeist to support phantomjs 2.0</title>
<updated>2015-03-19T08:33:01+00:00</updated>
<author>
<name>Zeger-Jan van de Weg</name>
<email>mail@zjvandeweg.nl</email>
</author>
<published>2015-03-19T08:29:43+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=d70126c1fbc65c4feeea6fb45424f5d4a30bb797'/>
<id>d70126c1fbc65c4feeea6fb45424f5d4a30bb797</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Bump gitlab_git to 7.1.2</title>
<updated>2015-03-18T17:25:22+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2015-03-18T17:25:22+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=85d226e57f24fd4c368bed3fe352a9f1f8db51a1'/>
<id>85d226e57f24fd4c368bed3fe352a9f1f8db51a1</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Update omniauth-ldap.</title>
<updated>2015-03-17T16:15:39+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2015-03-17T16:15:39+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=16b73176694d248d4ee6f8c8525857169872e12e'/>
<id>16b73176694d248d4ee6f8c8525857169872e12e</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
