<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/Gemfile, branch multi-line-inline-diff</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>Merge branch 'fix_gemfile' into 'master'</title>
<updated>2016-07-08T16:54:57+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-07-08T16:54:57+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=df97d5514e065d229dabe24f436923c4931ea828'/>
<id>df97d5514e065d229dabe24f436923c4931ea828</id>
<content type='text'>

Fix gemfile

1. replace `"` to `'` in Gemfile.

2. change `require: nil` to `require: false`.
`require: nil` and `require: false` get same result, but i think we shouldn't write it differently in other places.

3. set version for gems.
better gem's version control for prevent dependency errors.

See merge request !5078</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fix gemfile

1. replace `"` to `'` in Gemfile.

2. change `require: nil` to `require: false`.
`require: nil` and `require: false` get same result, but i think we shouldn't write it differently in other places.

3. set version for gems.
better gem's version control for prevent dependency errors.

See merge request !5078</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'upgrade-oauth2' into 'master'</title>
<updated>2016-07-07T23:53:57+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-07-07T23:53:57+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=cfb5a76bb26521ff3ff68acc20466ea7feb49d9f'/>
<id>cfb5a76bb26521ff3ff68acc20466ea7feb49d9f</id>
<content type='text'>

Upgrade oauth2 from 1.0.0 to 1.2.0.

Changelog: https://github.com/intridea/oauth2/compare/v1.0.0...v1.2.0

Follow-up on !3434 since 1.2.0 doesn't limit the JWT version we can use.

Adds support for Rails 5. Working toward #14286.

See merge request !5041</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Upgrade oauth2 from 1.0.0 to 1.2.0.

Changelog: https://github.com/intridea/oauth2/compare/v1.0.0...v1.2.0

Follow-up on !3434 since 1.2.0 doesn't limit the JWT version we can use.

Adds support for Rails 5. Working toward #14286.

See merge request !5041</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'update-gemoji' into 'master'</title>
<updated>2016-07-05T17:08:35+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-07-05T17:08:35+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=aefb8a1741b58a10832e63c73210b8608c2be753'/>
<id>aefb8a1741b58a10832e63c73210b8608c2be753</id>
<content type='text'>

Add lib/gitlab/emoji.rb instead of gitlab_emoji gem and upgrade Gemojione

- No reason to split it into a separate gem when the gem barely did anything. We can use gemojione directly, making updating gemojione that much easier. Unless there's a particularly good reason we were using the gem?
- Fixes the Rake task since it broke after all the AwardEmoji changes.
- Update gemojione to 2.6.1.

Spring Update changes! http://emojione.com/releases/#2.2.0

See merge request !4919</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Add lib/gitlab/emoji.rb instead of gitlab_emoji gem and upgrade Gemojione

- No reason to split it into a separate gem when the gem barely did anything. We can use gemojione directly, making updating gemojione that much easier. Unless there's a particularly good reason we were using the gem?
- Fixes the Rake task since it broke after all the AwardEmoji changes.
- Update gemojione to 2.6.1.

Spring Update changes! http://emojione.com/releases/#2.2.0

See merge request !4919</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'upgrade-doorkeeper' into 'master'</title>
<updated>2016-07-05T13:48:48+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-07-05T13:48:48+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=38533a2f4252921bbfde126c887510481aeaa01e'/>
<id>38533a2f4252921bbfde126c887510481aeaa01e</id>
<content type='text'>

Upgrade Doorkeeper from 3.1.0 to 4.0.0.

Includes Rails 5 support and various bug fixes. Working toward #14286.

Changelog: https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md#400

See merge request !5055</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Upgrade Doorkeeper from 3.1.0 to 4.0.0.

Includes Rails 5 support and various bug fixes. Working toward #14286.

Changelog: https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md#400

See merge request !5055</pre>
</div>
</content>
</entry>
<entry>
<title>set version for gems.</title>
<updated>2016-07-04T19:52:37+00:00</updated>
<author>
<name>bogdanvlviv</name>
<email>bogdanvlviv@gmail.com</email>
</author>
<published>2016-07-01T23:54:17+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=bfccdab70967c93592c70a71774cb355aae76ca3'/>
<id>bfccdab70967c93592c70a71774cb355aae76ca3</id>
<content type='text'>
better gem's version control for prevent dependency errors.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
better gem's version control for prevent dependency errors.
</pre>
</div>
</content>
</entry>
<entry>
<title>change `require: nil` to `require: false`</title>
<updated>2016-07-04T19:51:19+00:00</updated>
<author>
<name>bogdanvlviv</name>
<email>bogdanvlviv@gmail.com</email>
</author>
<published>2016-07-01T23:37:31+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=59eeac2962f36f693a5496e25f9f007fa71c4301'/>
<id>59eeac2962f36f693a5496e25f9f007fa71c4301</id>
<content type='text'>
require: nil and require: false get same result, but i think we shouldn't write it differently in other places.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
require: nil and require: false get same result, but i think we shouldn't write it differently in other places.
</pre>
</div>
</content>
</entry>
<entry>
<title>replace " to ' in Gemfile</title>
<updated>2016-07-04T19:51:19+00:00</updated>
<author>
<name>bogdanvlviv</name>
<email>bogdanvlviv@gmail.com</email>
</author>
<published>2016-07-01T23:14:12+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=589a9caf0a53be6da39ecf1c635c005fa995f8ff'/>
<id>589a9caf0a53be6da39ecf1c635c005fa995f8ff</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 'upgrade-rspec-rails' into 'master'</title>
<updated>2016-07-04T16:17:36+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-07-04T16:17:36+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=e09bdd78431371fd30ca1862f0466eacba09a0d2'/>
<id>e09bdd78431371fd30ca1862f0466eacba09a0d2</id>
<content type='text'>

Upgrade rspec-rails from 3.4.2 to 3.5.0.

Also upgrade its dependencies. Includes Rails 5 support. Working toward #14286 

Changelogs: http://rspec.info/blog/2016/07/rspec-3-5-has-been-released/

See merge request !5051</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Upgrade rspec-rails from 3.4.2 to 3.5.0.

Also upgrade its dependencies. Includes Rails 5 support. Working toward #14286 

Changelogs: http://rspec.info/blog/2016/07/rspec-3-5-has-been-released/

See merge request !5051</pre>
</div>
</content>
</entry>
<entry>
<title>Update RedCloth to 4.3.2 for CVE-2012-6684</title>
<updated>2016-07-03T03:23:19+00:00</updated>
<author>
<name>Takuya Noguchi</name>
<email>tak.noguchi.iridge@gmail.com</email>
</author>
<published>2016-06-26T15:18:46+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b6863388984853ccd6e9b49aadac9c714454257f'/>
<id>b6863388984853ccd6e9b49aadac9c714454257f</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Upgrade Doorkeeper from 3.1.0 to 4.0.0.</title>
<updated>2016-07-01T21:34:27+00:00</updated>
<author>
<name>Connor Shea</name>
<email>connor.james.shea@gmail.com</email>
</author>
<published>2016-07-01T21:34:27+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=d500ce9d3352e199be7370380c7e2b16958f7ecf'/>
<id>d500ce9d3352e199be7370380c7e2b16958f7ecf</id>
<content type='text'>
Includes Rails 5 support and various bug fixes.

Changelog: https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md#400
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Includes Rails 5 support and various bug fixes.

Changelog: https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md#400
</pre>
</div>
</content>
</entry>
</feed>
