# 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

Bump grape-path-helpers to 1.0.5

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

Add more logging before a project is destroyed

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

Users can accept terms during registration

Closes gitlab-ee#6262 and #47621

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

[EE-Port] Users can accept terms during registration

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

Bump Google Chrome to V67

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

This adds a simple log message but also allows EE to insert database
events within the transaction (https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6059/diffs).

Fix broken merge request views

Closes gitlab-qa#270 and #6363

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

Fix artifact breadcrumbs

Closes #47587

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

When a user checks the `accept` checkbox, we will track that
acceptance as usual. That way they don't need to accept again after
they complete the registration.

When an unauthenticated user visits the `/-/users/terms` page, there
is no button to accept, decline or continue. The 'current-user menu'
is also hidden from the top bar.

When a user checks the `accept` checkbox, we will track that
acceptance as usual. That way they don't need to accept again after
they complete the registration.

When an unauthenticated user visits the `/-/users/terms` page, there
is no button to accept, decline or continue. The 'current-user menu'
is also hidden from the top bar.

Refactor schema_spec.rb for CE-EE parity and simplicity

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