CE upstream - 2018-06-28 18:21 UTC

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

[Rails5] fix NoMethodError: undefined method 'downcase' for Hash

Closes #6749

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

[Rails5] fix Projects::VulnerabilityFeedbackController didn't match the schema

Closes #6747

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

[Rails5] fix Boards::ListsController expected the response to have status code 200 but it was 403

Closes #6746

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

QA: Fix waiting for Geo replication tests when replication is slow

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

Merge branch 'ee-43472-remove-environment-scope-field-on-cluster-creation-form-for-core-starter-plans' into 'master'

Adds a test for the environment scope field

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

Port of ccr/maintain_labels to EE

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

And filter by issue title to make the method more deterministic.

…with environment variables GEO_MAX_DB_REPLICATION_TIME and GEO_MAX_FILE_REPLICATION_TIME.

CE upstream - 2018-06-28 15:22 UTC

Closes gitaly#326, gitaly#315, gitaly#745, gitaly#1044, gitaly#876, gitaly#1202, gitaly#1201, gitaly#1199, gitaly#1198, gitaly#951, and gitlab-ce#48042

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

Add note to README about using $CI_COMMIT_REF_SLUG when using forward-slashes

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

Fix paragraph line height for emoji

Closes #48003

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

# Conflicts:
#	app/assets/javascripts/api.js

[ci skip]

Don't hash user ID in OIDC subject claim

Closes #47791

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

Revert merge request discussion buttons padding

Closes #48212

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

CE upstream - 2018-06-27 18:21 UTC

Closes gitaly#1237 and gitaly#1218

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

Resolve "No UI element to edit group label"

Closes #48255

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

FindAllCommits mandatory

Closes gitaly#326

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

Commits between in Gitaly only

Closes gitaly#315

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

expose permissions on types

Closes #47695

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

Resolve "Tooltips flicker when highlighting award emoji"

Closes #48568

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

#39604 - Change top-right avatar immediately upon avatar change

Closes #39604

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

This adds a reusable way to expose permissions for a user to types in
GraphQL.

Resolve "Merge request refactor displays changes dropdown incorrectly"

Closes #48497

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

Closes https://gitlab.com/gitlab-org/gitaly/issues/326

Resolve "Add `id` attributes to settings section to allow to open if an hash is provided in the URL"

Closes #37561

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

EE port of Resolve "Add `id` attributes to settings section to allow to open if an hash is provided in the URL"

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