Don't use Gitlab::Utils.nlbr in Gitlab::Git

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

Move gitaly_blame,  gitaly_count_commits, gitaly_commit_count to opt-out

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

Update rspec to 3.7

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

Enable mapping to nil in enums

Closes #47032 and #46279

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

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

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

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

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

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 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.

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

Because if reload is true, then we spend a lot of time waiting for page load and yielding (to has_css? etc, which already waits for the default Capybara time) anyway. And if reload is false, there’s no reason not to check what’s on the page at all times.

There doesn’t seem to be a downside.

When the subgroup doesn’t exist, this will now return false as soon as the “Sorry” text appears, instead of waiting for the default Capybara wait time.

Also, it actually seems to wait the full 60 seconds, indicating it never finds the element.

The former “user is able to protect a branch” test no longer has a lot of value after adding the new “authorized users are allowed to push” test, and its setup is redundant, so we may as well save QA spec time by combining them.