Support for LFS object import was added by gitlab-org/gitlab-ce!18871

Use tooltip component in MrWidgetSecondaryGeoNode vue component

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

During a project destroy, log the audit and Geo events within the transaction

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

CE upstream - 2018-06-11 09:22 UTC

Closes gitlab-qa#269

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

Ensure Severity and Confidence are displayed independently for SAST vulnerabilities.

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

Adding parameter to UrlValidator to check the user

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

EE: Hide project name if searching against a project

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

[EE] Update rspec to 3.7

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

Merge branch '6364-actionview-template-error-undefined-method-present-for-nil-nilclass' into 'master'

Resolve "ActionView::Template::Error: undefined method `present' for nil:NilClass"

Closes #6364

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

Remove comma from weight system notes

Closes #6372

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

Set `max_old_space_size` option of node to 3.5GB during compile:assets

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

# Conflicts:
#	Gemfile.lock

[ci skip]

Resolve "`TimeTrackingComparisonPane` vue component tech debt"

Closes #44742

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

Remove SCLAU to mirror https://gitlab.com/gitlab-org/gitlab-ee/commit/cd5cef8f84a2b8c58a741e90afec232243a9f3a9

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

Refactored a use case in Contribution Analytics documentation

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

EE: Upgrade gitlab-markup to fix render issue with reStructuredText

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

Upgrade gitlab-markup to fix render issue with reStructuredText

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

Update QA deploy key clone test to wait for job traces

Closes gitlab-qa#269

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

Add QA test for authorized push to protected branch

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

[EE port] Add QA test for authorized push to protected branch

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

Use nip.io instead of xip.io for jupyter domain suggestion

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

Remove SCLAU to mirror https://gitlab.com/gitlab-org/gitlab-ee/commit/cd5cef8f84a2b8c58a741e90afec232243a9f3a9

CE upstream - 2018-06-09 05:14 UTC

Closes #6262

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

# Conflicts:
#	app/views/devise/shared/_signup_box.html.haml
#	locale/gitlab.pot

[ci skip]

CE upstream - 2018-06-08 15:42 UTC

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