# 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

Refactor schema_spec.rb for CE-EE parity and simplicity

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

Merge branch '47532-follow-up-from-resolve-add-deploy-strategies-to-auto-devops-settings' into 'master'

Resolve "Follow-up from "Resolve "Add deploy strategies to Auto DevOps settings"""

Closes #47532

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

[ci skip]

Resolve "discussion has a weird margin around it"

Closes #47519 and #47507

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

Resolve "No new security vulnerabilities help popover is not showing up"

Closes #6342

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

# Conflicts:
#	Gemfile.rails5.lock
#	db/schema.rb
#	locale/gitlab.pot

[ci skip]

CE upstream - 2018-06-08 12:25 UTC

Closes #5974, gitlab-qa#251, and gitlab-qa#258

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

Updates templates for 11.0

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

[Rails5] Update Gemfile lock-files

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

Use same gem versions for rails5 as for rails4 where possible

Closes #47370, #46232, #47367, and #47373

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

Update settings section titles

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

Update the dependencies license list

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

Revert rename allow collaboration column

Closes #47566

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