delta/gitlab/gitlab-ce.git/Gemfile, branch patch/load_average

Merge branch 'remove-deprecated-finders' into 'master'

2016-05-13T20:49:38+00:00


Remove activerecord-deprecated_finders gem

We don’t use any of the deprecated finders, so it should be safe to remove.

See https://github.com/rails/activerecord-deprecated_finders#active-record-deprecated-finders for more information.

Resolves #17015.

See merge request !3981

Merge branch 'health-check-route'

2016-05-12T21:39:03+00:00

# Conflicts:
#	db/schema.rb

Remove activerecord-deprecated_finders gem

2016-05-11T00:38:08+00:00

We don’t use any of the deprecated finders, so it should be safe to
remove.

Resolves #17015.

Removes jquery-scrollto-rails.

2016-05-11T00:31:36+00:00

Instead the script is now included directly from the vendor directory.

Resolves #17166.

Update Ace Editor

2016-05-10T18:59:05+00:00

Add the health_check gem end expose the health_check route

2016-05-10T15:24:09+00:00

Remove the annotate gem and delete old annotations

2016-05-09T16:00:28+00:00

In 8278b763d96ef10c6494409b18b7eb541463af29 the default behaviour of annotation
has changes, which was causing a lot of noise in diffs. We decided in #17382
that it is better to get rid of the whole annotate gem, and instead let people
look at schema.rb for the columns in a table.

Fixes: #17382

Merge branch 'stanhu/gitlab-ce-bump-mailroom'

2016-05-05T12:34:04+00:00

Merge branch 'revert-devise-async' into 'master'

2016-05-04T13:55:00+00:00


Revert "Remove the Devise Async gem."

This reverts commit 1cc614f2bdd30b4fce35ee9e680f9272b9012978.

It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again.

Resolves #17250.

See merge request !4027

Revert "Remove the Devise Async gem."

2016-05-03T21:43:51+00:00

This reverts commit 1cc614f2bdd30b4fce35ee9e680f9272b9012978.

It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again.