when the namespace has subgroups with projects.

CE upstream - 2018-05-14 18:24 UTC

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

Correct skewed Kubernetes popover illustration

Closes #46345

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

CE upstream - 2018-05-14 16:02 UTC

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

# Conflicts:
#	app/assets/javascripts/vue_merge_request_widget/dependencies.js

[ci skip]

Move SquashBeforeMerge vue component

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

Move SquashBeforeMerge vue component

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

Backport EE-specific untrusted regexp implementation

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

Improve the code review section in MR templates.

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

Geo: Fix incorrect datetime_with_timezone schema

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

Geo: Gracefully handle a non-JSON response from the node status

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

More verbose logging for deprecated path access

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

Fix cross-origin errors when attempting to download JavaScript attachments

Closes #45826

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

Change mod of image to 0644

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

update sidekiq 5.0 -> 5.1

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

CE upstream - 2018-05-14 12:38 UTC

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

Consolidate all security reports under one section

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

Resolve "[Rails5] Fix spec/models/ci/pipeline_spec.rb"

Closes #46229

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

Current logging tells us we've isolated the calls to about 5 call sites,
now we'd like to know what is calling these methods.

remove duplicated lines

Closes #5998

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

Change `expect` to `except` on help page

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

CE upstream - 2018-05-14 10:03 UTC

Closes gitaly#1184 and gitaly#1169

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

# Conflicts:
#	app/assets/javascripts/vue_merge_request_widget/dependencies.js
#	spec/features/projects/merge_requests/user_creates_merge_request_spec.rb

[ci skip]

Resolve "`sha-mismatch` vue component is rendering an empty block"

Closes #45462

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

Resolve "`sha-mismatch` vue component is rendering an empty block"

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

Add `createComponentWithMixin` to create anonymous components with mixins

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

Fix system hook not firing for blocked users when LDAP sign-in is used

Closes #46307

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

Add feature check to Lock button

Closes #5952

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

Update secpick to use security branches

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