# Conflicts:
#	db/schema.rb

[ci skip]

Merge branch 'blackst0ne-rails5-activerecord-statementinvalid-mysql2-error-expression-1-of-select-list-is-not-in-group-by-clause' into 'master'

[Rails5] Fix milestone GROUP BY query

Closes #48428

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

Extract EE-specific lines from NotificationService

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

Allow to store BuildTraceChunks on Object Storage

Closes #45712

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

CE upstream - 2018-07-06 09:21 UTC

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

Partially revert "Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'""

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

Backport of EE changes "Add support for autocompleting Epics and Labels within Epics"

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

Add support for autocompleting Epics and Labels within Epics

Closes #5604 and #5605

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

Added merge request info to Web IDE sidebar

Closes #45187

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

Resolve "Undefined omniauth_authorize_path when omniauth_enabled not enabled"

Closes #48677

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

[EE-Port] Create cross project group features

Closes #4829

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

Create cross project group features

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

This partially reverts commit 64dfe2cb.

Fix cross-project label references

Closes #45539

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

Remove redundant query when removing trace

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

CE upstream - 2018-07-06 00:21 UTC

Closes gitaly#1254, #6753, and #6561

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

Refactor AutocompleteSources#label:

1. The return value was inconsistent, sometimes returning a hash and sometimes returning an ActiveModel.
2. It was inconsistent with respect to other methods in the class since they all return ActiveModels.

Check if the existences of archived traces before archive it

Closes #48705

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

This allows us to check specific abilities in views, while still
enabling/disabling them at once.

CE for "Remove new contributing link from EE"

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

Remove new contributing link from EE

Closes gitlab-ce#47274

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

Fix User role displayed on projects dashboard

Closes #43565

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

This allows us to check specific abilities in views, while still
enabling/disabling them at once.

Resolve "GFM preview should have status indicator"

Closes #31583

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