delta/gitlab/gitlab-ce.git/Gemfile, branch compare-code-view

Merge branch 'update-rubocop' into 'master'

2016-07-15T17:19:38+00:00


Update rubocop to 0.41.2

Adds a couple of cops to the TODO files, but I wanted [a specific cop](https://github.com/bbatsov/rubocop/pull/3135/files) which just had about 65 offences, so Ill do that later.

See merge request !4999

Upgrade Rails from 4.2.6 to 4.2.7.

2016-07-13T18:15:11+00:00

Primarily just bug fixes.

Changelog: https://github.com/rails/rails/compare/v4.2.6...v4.2.7

Resolve feedback.

2016-07-13T18:12:47+00:00

Update rubocop to 0.41.2

2016-07-13T18:12:47+00:00

https://github.com/bbatsov/rubocop/blob/v0.41.2/CHANGELOG.md

Update the health_check gem to the latest release

2016-07-11T16:30:47+00:00

This allows us to drop our disable email config override

Merge branch 'bump-omniauth-google-oauth2' into 'master'

2016-07-10T20:16:33+00:00


Bump google-omniauth-oauth2 to 0.4.1

Closes #19064

See merge request !4882

Merge branch 'fix_gemfile' into 'master'

2016-07-08T16:54:57+00:00


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

Merge branch 'upgrade-oauth2' into 'master'

2016-07-07T23:53:57+00:00


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

Merge branch 'update-gemoji' into 'master'

2016-07-05T17:08:35+00:00


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

Merge branch 'upgrade-doorkeeper' into 'master'

2016-07-05T13:48:48+00:00


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