# Conflicts:
#	app/assets/javascripts/notes/stores/getters.js
#	app/models/application_setting.rb
#	app/models/commit_status.rb
#	db/schema.rb

[ci skip]

CE upstream - 2018-11-05 12:21 UTC

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

Fix invalid artifact path for codequality

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

Using class= requires an exact match

Performance tuning on Projects::GitHttpController#info_refs

Closes #48239

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

Allow concurrency when using Puma

Closes #53362

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

Remove gitlab-ui's tooltip from global

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

Resolve "Clicking on Commit SHA and Text reloads ops dashboard"

Closes #8263

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

Removes the unknown overview from the group security dashboard

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

Replaces the issue icon on the group security dash

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

Missing EE-port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22106

Fix pipeline schedule style issues

Closes #52925

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

EE: Allow to make builds soft-archived.

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

Disallow retry of old builds

Closes #50939

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

The soft-archived builds cannot be run after some deadline time.
The intent is to aggressively recycle old builds after sometime.

The soft-archived builds cannot be run after some deadline time.
The intent is to aggressively recycle old builds after sometime.

Removes extra right margin from job page

Closes #8282

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

Remove PersonalAccessTokensFinder#find_by method

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

Start tracking pool repositories

Closes #38238 and #52300

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

Disable replication lag check for Aurora PostgreSQL databases

Closes #52176

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

Update project and group labels empty state

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

EE port of Add 'only history' option to notes filter

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

Add 'only history' option to notes filter

Closes #51323

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

CE upstream - 2018-11-05 11:22 UTC

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

[skip ci]

Only allow Ruby to have extra prepend line

Closes #8215

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

Filter epics by state in API

Closes #7615

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

Bump Gitaly to 0.128.0

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

Add the Play button for delayed jobs in environment page

Closes #52129

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

QA Selectors for Batch Comment E2E Automation

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