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

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

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

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

Run the review-docs jobs for gitlab-org repos only

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

Update template name via sentence case (research)

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

Update template name via sentence case (security)

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

Update template name via sentence case (database changes)

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

Add readme button to non-empty project page

Closes #46963

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

Temporarily remove MR diffs removal migration

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

# Conflicts:
#   doc/user/project/integrations/bamboo.md

We will re-add this with a more efficient bulk scheduling method.

Backport partial index to find repositories that have not been checked

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

Log repository check and failed count to Prometheus

Closes #5944

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

Resolve "New issue from failed build no longer links to failed build"

Closes #36907

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

Copyedit license management docs

Closes gitlab-ce#47859

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

Add HA webcast video to HA docs

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

Copyedit Bamboo integration docs

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

Copyedit Bamboo integration docs

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

Change two /products links to /pricing

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

# Conflicts:
#	app/models/user.rb
#	doc/administration/job_artifacts.md
#	doc/ci/variables/README.md
#	doc/user/project/integrations/bamboo.md
#	doc/user/project/issues/index.md
#	doc/user/project/merge_requests/index.md
#	doc/user/project/repository/index.md
#	doc/user/project/settings/index.md

[ci skip]

New Crowdin translations

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

Fix Bamboo CI status not showing for branch plans

Closes #1355

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

Make OperationService RPC's mandatory

Closes gitaly#801, gitaly#779, gitaly#755, gitaly#754, gitaly#727, gitaly#680, gitaly#633, gitaly#547, gitaly#546, and gitaly#541

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

Fix MR diffs created with gitaly_diff_between enabled

Closes gitaly#1256

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