delta/gitlab/gitlab-ce.git/lib, branch docs/commit-diff-discussions-in-mr-context

Merge branch 'jprovazn-description' into 'master'

2017-12-12T12:51:35+00:00

Use message body for merge request description

Closes #40968

See merge request gitlab-org/gitlab-ce!15839

Merge branch 'gitaly-mirroring-prep' into 'master'

2017-12-11T20:50:07+00:00

Gitaly mirroring migration prep

Closes gitaly#816

See merge request gitlab-org/gitlab-ce!15775

Merge branch 'sh-remove-allocation-tracking-influxdb' into 'master'

2017-12-11T15:57:17+00:00

Remove allocation tracking code from InfluxDB sampler for performance

Closes gitlab-com/infrastructure#3250

See merge request gitlab-org/gitlab-ce!15834

Remove RubySampler#sample_objects for performance as well

2017-12-11T14:55:59+00:00

Keep track of storage check timings

2017-12-11T12:18:39+00:00

Merge branch 'mk-pick-10-2-4-security-fixes' into 'master'

2017-12-11T12:07:57+00:00

Pick 10.2.4 security fixes into master

See merge request gitlab-org/gitlab-ce!15821

Use message body for merge request description

2017-12-11T10:46:21+00:00

When a merge request is created from email, use message body
as merge request description. If message body is empty then
merge request description is still created from the source
branch commit (if there is only single commit in the merge
request).

If message body is empty and there are multiple commits in
the source branch, then merge request description is left empty.

Closes #40968

Simplify normalizing of paths

2017-12-11T07:36:46+00:00

Remove allocation tracking code from InfluxDB sampler for performance

2017-12-11T05:53:28+00:00

On GitLab.com, InfluxSampler#sample_objects appears to take 1.2 s or so to
iterate through 1059 objects. This had led to delays of a couple hundred
milliseconds in processing in the main thread. Remove this code since it's not
really being used.

Closes gitlab-com/infrastructure#3250

Fix failing importer test case on MySQL due to missing trailing slash in root path

2017-12-09T00:48:24+00:00