delta/gitlab/gitlab-ce.git/Gemfile, branch refactor_config_processor_save

Merge branch 'updated-contrib-calendar' into 'master'

2016-05-25T23:29:41+00:00


POC: Updated contrib calendar

In an effort to cut down the JS file size - i've removed the heatmap calendar used for the contributing calendar on users profiles. We already have d3 on the page so why not use it instead of using a library which uses it?

![Screen_Shot_2016-04-27_at_11.08.41](/uploads/64c40f0c766f800fd0e33ac8be7f9644/Screen_Shot_2016-04-27_at_11.08.41.png)

cc. @jschatz1 

See merge request !3944

Update state_machines-activerecord from 0.3.0 to 0.4.0.

2016-05-25T21:17:53+00:00

No changelog, see commits: https://github.com/state-machines/state_machines-activerecord/commits/master

Includes Rails 5 support.

Add rubocop-rspec

2016-05-23T19:59:32+00:00

Almost all cops are starting as disabled until we can fix their
violations.

Update rubocop to 0.40.0

2016-05-23T18:03:04+00:00

Upgrade activerecord-sessionstore from 0.1.2 to 1.0.0.

2016-05-20T02:08:07+00:00

Changelog: https://github.com/rails/activerecord-session_store/releases/tag/v1.0.0

Includes Rails 5 support.

Removed cal heatmap from gemfile

2016-05-16T11:22:17+00:00

Merge remote-tracking branch 'origin/master' into docker-registry

2016-05-13T22:14:46+00:00

# Conflicts:
#	config/initializers/1_settings.rb

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.