Reduce merge conflicts in the User model

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

EE: reduce merge conflicts in the User model

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

Reserve more RAM for master process in Puma

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

CE upstream - 2018-11-01 16:21 UTC

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

docs - Update definition of done with e2e tests requirement

Closes gitlab-org/quality/team-tasks#67

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

Use CI_COMMIT_REF_SLUG when building assets image

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

* Using CI_COMMIT_REF_NAME fails when the branch or tag contains special
characters

CE backport from  Added a search bar to `Admin > Geo > Projects`

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

Added a search bar to `Admin > Geo > Projects`

Closes #8121

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

Use merge_db_schema for db/schema.rb conflicts

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

This allows EE code to reuse the search partial and append additional
query parameters to it, and have it preserved when searching.

CE upstream - 2018-11-01 14:21 UTC

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

Add dynamic timer for delayed jobs in job list

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

Changes the popover message on the group sec dashboard

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

This moves the `where` in the `has_many :keys` association in Project to
the Key model. This allows EE to override this method, instead of
modifying the source code directly.

CE upstream - 2018-11-01 11:21 UTC

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

This moves the `where` in the `has_many :keys` association in Project to
the Key model. This allows EE to override this method, instead of
modifying the source code directly.

This moves the `1.hour` constant used as the LDAP sync time to a
separate method. This allows EE to override this method using a module,
instead of directly modifying the source code.

This Gem can be used to automatically resolve merge conflicts in
db/schema.rb. To use it you still need to initialise the configuration,
which can be done by running:

    merge_db_schema-init --force

See https://gitlab.com/gitlab-org/release/framework/issues/42 for more
information.

add referenced merge_requests endpoint

Closes #39157

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

# Conflicts:
#	db/schema.rb
#	doc/api/issues.md
#	doc/api/merge_requests.md

[ci skip]

Fixes automatic URL formatting on Maven Page

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

EE port of 44012-filter-reactions-none-any

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

Improve markdown and fix links that don't render correctly

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

Improve markdown and fix links that don't render correctly

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

Improve markdown and fix links that don't render correctly

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

Resolve "Filter by `None`/`Any` for milestone in issues/mrs API"

Closes #52382

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

Refactor SSH keys docs for Windows clients

Closes #46398 and #46399

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

CE upstream - 2018-11-01 06:21 UTC

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

Fix typos in comments and specs

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