delta/gitlab/gitlab-ce.git/Gemfile.lock, 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 'rs-gemfile-lock' into 'master'

2016-07-10T20:20:52+00:00


Update Gemfile.lock after versions were added in !5078

See merge request !5171

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

Update Gemfile.lock after versions were added in !5078

2016-07-10T19:48:32+00:00

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 '18593-update-rinku' into 'master'

2016-07-05T21:51:41+00:00


Bump Rinku to 2.0.0

## What does this MR do?

Update Rinku gem to last stable version.

## What are the relevant issue numbers?

#18593 

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- ~~[ ] API support added~~
- Tests
  - ~~[ ] Added for this feature/bug~~
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5064