CE upstream - 2018-10-19 09:30 UTC

Closes gitlab-com/support-forum#3825

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

Document highlighted mentions

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

# Conflicts:
#	app/assets/javascripts/jobs/components/job_app.vue

[ci skip]

CE upstream - 2018-10-18 20:49 UTC

Closes gitlab-ce#52654

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

Documentation: Add mention that recovery codes are downloadable.

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

Update Test plan.md : add ~"test plan" and update attributes

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

Catch `RedirectionTooDeep` Exception in webhooks

Closes #52692

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

Elasticsearch v6 - migrate from parent/child relationships to joins

Closes #4218

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

Expose changed URLs in MR ci_environments_status

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

Add the ways needed to authenticate to the registry via CI/CD

Closes gitlab-com/support-forum#3825

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

Add Triggering Pipelines docs to API readme

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

Add support for JSON logging for audit events

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

This will add audit_json.log that writes one line per audit event. For
example:

{
       "severity":"INFO",
       "time":"2018-10-17T17:38:22.523Z",
       "author_id":3,
       "entity_id":2,
       "entity_type":"Project",
       "change":"visibility",
       "from":"Private",
       "to":"Public",
       "author_name":"John Doe4",
       "target_id":2,
       "target_type":"Project",
       "target_details":"namespace2/project2"
}

Make app/assets/javascripts/jobs/components/job_app.vue prettier

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

Make app/assets/javascripts/jobs/components/job_app.vue prettier (EE-port)

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

CE upstream - 2018-10-18 15:22 UTC

Closes #8055

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

Revised images in group docs to address gitlab-org/gitlab-ce#43422

Closes #43422

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

Fix param typo in Notes documentation

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

Should be `start_in` not `start_key`

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

Associate Rakefile with Ruby icon in diffs

Closes #52654

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

repository check doc: fix a broken link

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

Remove beta status on hashed storage and reference to production readiness review.

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

Update README ruby version 2.3->2.4

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

Use monotonic time in computing web hook execution time

Closes #52855

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

[QA] Fix the 'no setup' workflow in Geo scenario

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

Fixes broken test in master for ci status bagde

Closes #52886

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

# Conflicts:
#	app/views/layouts/header/_help_dropdown.html.haml

[ci skip]

Multiple spring rake commands cause "NameError: uninitialized constant HamlLint::Linter"

Closes #52843

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