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

Closes gitlab-ce#52654

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

Elasticsearch v6 - migrate from parent/child relationships to joins

Closes #4218

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

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

Merge branch '7963-geo-rails-console-message-display-primary-secondary-state-incorrectly' into 'master'

Geo: Rails console message display primary/secondary state incorrectly

Closes #7963

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

Remove broken link

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

(Port to EE) Fix linting

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

Link to Nurtch doc site.

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

Rails5: fix deployment model spec

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

[QA] Fix resource API fabrication documentation

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

CE upstream - 2018-10-18 13:21 UTC

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

Split troubleshooting docs review apps in own section

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

The precedence of methods to fetch a product's attribute value was changed recently:

1. API response
2. Web UI block
3. Inheritance from the factory
4. Raise a `QA::Factory::Product::NoValueError` error otherwise

Docs: Documents "help and feedback" section and Disqus

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

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

Resolve "Re-arrange help-related user menu items into new Help menu"

Closes #50728

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

Resolve "Re-arrange help-related user menu items into new Help menu"

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