delta/gitlab/gitlab-ce.git/config/initializers, branch feature/github-edit-path

Gitlab::Checks is now instrumented

2016-09-13T09:58:08+00:00

So we have a detailed view of what checks perform bad

Merge branch 'rails-5-backports' into 'master'

2016-09-12T21:02:57+00:00


Fix two problematic bits of code that will be deprecated or broken in Rails 5.

Found in the Rails 5 MR: !5555

These are safe to use in Rails 4.2.7 as well as Rails 5.0.0, so I figured I'd backport them for the sake of making that merge request smaller.

The explanation for the mime_types.rb code is here: https://github.com/rails-api/active_model_serializers/issues/1027#issuecomment-126543577

See merge request !6214

No need for this variable.

2016-09-12T20:23:32+00:00

Remove x-json mime_type, rename to json_mime_types.

2016-09-11T22:03:17+00:00

Merge branch 'gitlab-workhorse-safeties' into 'master'

2016-09-09T11:33:08+00:00


Security and safety improvements for gitlab-workhorse integration

Companion to https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/60

- Use a custom content type when sending data to gitlab-workhorse
- Verify (using JWT and a shared secret on disk) that internal API requests came from gitlab-workhorse

This will allow us to build features in gitlab-workhorse that require
more trust, and protect us against programming mistakes in the future.

This is designed so that no action is required for installations from
source. For omnibus-gitlab we need to add code that manages the shared
secret.

See merge request !5907

Limited amount of pruned Event rows per run

2016-09-07T17:41:25+00:00

Old deployments of Gitlab might have a big number of old events to be
deleted. Such numbers cause the worker to timeout.
I've limited the amount of rows that should be destroyed at once to
10000, and increased how often pruning shall take place to 4 times a
day.

Added cron to prune events older than 12 months.

2016-09-07T17:41:25+00:00

Since contribution calendar shows only 12 months of activity,
events older than that time are not visible anywhere and can be
safely pruned saving big amount of database storage.

Fixes #21164

Fix two problematic bits of code that will be deprecated or broken in Rails 5.

2016-09-06T02:58:27+00:00

Verify JWT messages from gitlab-workhorse

2016-09-05T13:05:31+00:00

Fix Sentry not reporting right program for Sidekiq workers

2016-08-26T02:42:52+00:00

Moves program tag into the global configuration since this doesn't
change and since Sidekiq workers get a unique context for each event.

Closes #21410