delta/gitlab/gitlab-ce.git/config/initializers, branch ci-https

Merge commit 'dev/security' into 'master'

2016-10-06T06:33:11+00:00

Signed-off-by: Rémy Coutable

Don't send Private-Token headers to Sentry

2016-10-04T14:57:01+00:00

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22537

add configurable email subject suffix

2016-10-03T10:07:28+00:00

Merge branch 'initialize-redis' into 'master'

2016-09-30T12:32:18+00:00


Initialize Redis pool in single-threaded context

See merge request !6613

Initialize Redis pool in single-threaded context

2016-09-30T10:27:43+00:00

This side-steps the need for mutexes and whatnot.

Use `Module#prepend` instead of `alias_method_chain`

2016-09-30T10:08:25+00:00

Update warn message for MySQL fix

2016-09-28T23:48:32+00:00

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