CE upstream - 2018-07-04 00:21 UTC

See merge request gitlab-org/gitlab-ee!6371

Fix content of the parallel diff lines

Closes #48797

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

Improve performance of toggling diff view type

Closes #48666 and #48733

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

CE upstream - 2018-07-03 21:01 UTC

See merge request gitlab-org/gitlab-ee!6368

# Conflicts:
#	doc/administration/monitoring/prometheus/gitlab_metrics.md

[ci skip]

Add Prometheus metrics to track reCAPTCHA success/failures

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

CE upstream - 2018-07-03 18:21 UTC

See merge request gitlab-org/gitlab-ee!6367

Implement file copy for object storage when moving an issue

Closes #48505

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

Closes #48505

Resolve "QA: Deploy key cloning test sometimes can't find the QA element"

Closes #48243

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

CE upstream - 2018-07-03 15:24 UTC

See merge request gitlab-org/gitlab-ee!6364

Fixed pagination of web hook logs

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

Resolve "The  header navbar line separator is missing"

Closes #48634

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

Remove trailing comma from weight system notes

Closes #6347

See merge request gitlab-org/gitlab-ee!6361

Add `pod` dropdown to pod logs screen

Closes #5766

See merge request gitlab-org/gitlab-ee!6111

# Conflicts:
#   db/schema.rb

Resolve "Render SHA in merge request commit reference with mono spaced font"

Closes #44994

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

We added a comma to the end of these to disambiguate between the value and the
timestamp after it. In the following release, we added a dot between the note
and the timestamp, so the comma was redundant.

This uses a background migration to find notes that are:

1. System notes.
2. That are about weight.
3. That end in a comma.

And remove the comma and clear the cached HTML. There are about 15,000 of these
on GitLab.com.

Update template name via sentence case (feature)

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

DRY group creation code in nested groups fixtures

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

Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into update-template-name-via-sentence-case

# Conflicts:
#	.gitlab/issue_templates/Feature proposal.md

CE upstream - 2018-07-03 09:22 UTC

Closes #1355, gitaly#801, gitaly#779, gitaly#755, gitaly#754, gitaly#727, gitaly#680, gitaly#633, gitaly#547, gitaly#546, gitaly#541, gitaly#1256, #6224, and gitlab-ce#46120

See merge request gitlab-org/gitlab-ee!6359

Do not run review app images for docs only changes

See merge request gitlab-org/gitlab-ee!6355