As part of reviewing our UI strings mentioning merge requests, this change updates the merge request message:

* OLD: "There are merge conflicts"
* NEW: "Merge blocked: merge conflicts must be resolved."

Changelog: changed

Merge branch '230762-tabs-haml-migrate-app-views-snippets-_snippets_scope_menu-html-haml-to-gltabs-2' into 'master'

Migrate snippets_scope_menu tabs to rails helper

See merge request gitlab-org/gitlab!74867

Unmask scope and state in url masking

See merge request gitlab-org/gitlab!74973

Add URL to rejection_message if terms_not_accepted

See merge request gitlab-org/gitlab!75082

Fix time_frame for awarding_epic_emoji_weekly metric

See merge request gitlab-org/gitlab!75037

Refresh steps to add issue to iteration

See merge request gitlab-org/gitlab!75038

Am add service ping config e2e test

See merge request gitlab-org/gitlab!73358

Add and use gl_badge_tag helper in runner settings

See merge request gitlab-org/gitlab!73858

Allow instantiating SidekiqExporter with settings

See merge request gitlab-org/gitlab!74875

Update approval rules page objects

See merge request gitlab-org/gitlab!74969

Resolve "Create a new Feature"

See merge request gitlab-org/gitlab!73275

Added mocked schema and frontend implementation for work item creation

Add more merging messages from the community

See merge request gitlab-org/gitlab!74720

The messages were inspired by
community suggestions in this Twitter
thread: https://twitter.com/PedroMScom/status/1438895998256959488

Changelog: changed

Add IntersectionObserver utilities

See merge request gitlab-org/gitlab!75067

Use GitLab fork of LicenseFinder and update version to 6.14.2.1

See merge request gitlab-org/gitlab!74881

Fixes OpenStruct use in epics_resolvers_spec

See merge request gitlab-org/gitlab!74976

doc: Fix usage example for `GET /projects/:id/repository/changelog`

See merge request gitlab-org/gitlab!75089

Fix inconsistencies in feature flag examples

See merge request gitlab-org/gitlab!75043

Fixes diff file tree list not be resizable

See merge request gitlab-org/gitlab!74914

Revise UI text line about merge dependencies

See merge request gitlab-org/gitlab!74940

Revert "Merge branch '288337-dast-site-profile-mocks' into 'master'"

See merge request gitlab-org/gitlab!75094

This reverts merge request !74111

Move unit/integration test setup to shared module

See merge request gitlab-org/gitlab!74432

This change improves the OAuth2 error for when users have not accepted
the Terms of Use by providing users with a URL to the gitlab instance
they should sign into in order to accept the Terms of Use.

Changelog: changed

Delete upstream_project_subscriptions outside of project transaction

See merge request gitlab-org/gitlab!75065

Update metrics defintion with introduced_by_url

See merge request gitlab-org/gitlab!75018

Fix incorrect naming in code related to cross-references

See merge request gitlab-org/gitlab!74903

Fix empty state of IDE pipelines tab

See merge request gitlab-org/gitlab!74916

Signed-off-by: Rémy Coutable <remy@rymai.me>

Clean up feature flag information in issue boards doc

See merge request gitlab-org/gitlab!75040

Merge branch '330882-dependency-scanning-vulnerability-reports-a-lot-of-duplicate-links-clear-table' into 'master'

Background migration removing vuln finding links

See merge request gitlab-org/gitlab!73780

Only mock ci connections in single db mode

See merge request gitlab-org/gitlab!74846

This is because upstream_project_subscriptions is a CI table, and so
shouldn't be written to in the context of a transaction for the main
table.