[merge-train skip]

[ci skip]

[ci skip]

Enforce Jira namespace permissions

See merge request gitlab-org/security/gitlab!1647

Prevent non-admins from configuring Jira connect app

See merge request gitlab-org/security/gitlab!1643

Update apollo_upload_server dependency

See merge request gitlab-org/security/gitlab!1701

Update Import/Export to use public email when mapping users

See merge request gitlab-org/security/gitlab!1654

Merge branch 'security-fix-private-instance-keys-endpoint-access-backport-14-0' into '14-0-stable-ee'

Require sign in for .keys endpoint on non-public instances

See merge request gitlab-org/security/gitlab!1659

Merge branch 'security-fix-privelege-escalation-from-external-to-internal-14-0' into '14-0-stable-ee'

Inherit user external status while creating project bots

See merge request gitlab-org/security/gitlab!1666

Fix stored XSS in the Jira issue detail pages

See merge request gitlab-org/security/gitlab!1663

Make design filename pattern stricter

See merge request gitlab-org/security/gitlab!1623

Fix stored XSS vulnerability in Datadog settings form

See merge request gitlab-org/security/gitlab!1672

Ensure shared group members lose project access after group deletion

See merge request gitlab-org/security/gitlab!1685

This enables us to make use of `strict_mode`, preventing denial of
service attacks.

Changelog: security

[merge-train skip]

[ci skip]

[ci skip]

Prepare 14.0.8-ee release

See merge request gitlab-org/gitlab!68761

Backport fix for flaky spec to 14.0

See merge request gitlab-org/gitlab!68959

Taken from https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65153.

Geo 2.0 Regression - Add ability to remove primary

See merge request gitlab-org/gitlab!68867

Backport: Fix Sidekiq workers delete each other's metrics

See merge request gitlab-org/gitlab!68771

When a group is invited to shared access with a project, and the
group is later deleted, this change ensures the members
of the group no longer have access to the project.

Changelog: security

When we moved the logic that wipes the Prometheus metrics
dir out of the Rackup file and into the initializer, all
Sidekiq workers would call this and potentially enter a
race condition where they deleted each other's database
files.

Changelog: fixed

Mark Chao authored 3 years ago and GitLab Release Tools Bot committed 3 years ago

Resolve "operator does not exist: integer[] || bigint in app/models/namespace/traversal_hierarchy.rb"

See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67288

Changelog: changed

Andreas Brandl authored 3 years ago and GitLab Release Tools Bot committed 3 years ago

See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66627

Changelog: other

Previously we generated the URL for the link in the help text based on
the user-submitted value in `datadog_site`, which caused a stored XSS
vulnerability.

This was accidentally fixed with the HTML-escaping we added in
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66391 while
improving the help texts for this integration.

But this still leaves some room for exploitation by changing the URL
of a seemingly-trusted link, so instead we just hard-code the default
link to the documentation on docs.datadoghq.com, and remove the custom
link which goes directly to the user's API settings.

Changelog: security

Project bots should be external if created by external user

Changelog: security

Changelog: security
EE: true

To make the behavior of /username.keys endpoint
with /api/v4/users/:id/keys endpoint

Changelog: security

Changelog: security
EE: true

This prevents non-admins from creating Jira Connect namespace
subscriptions.

This additional check is controlled by a new ops feature flag
(`jira_connect_require_site_admins`) so that it can be disabled
for self-hosted installations if required.

Changelog: security

Changelog: security

[merge-train skip]

[ci skip]

[ci skip]

Don't allow to add users to project with email different than group sett

See merge request gitlab-org/security/gitlab!1563

Hide project-level CI/CD Analytics page for Guest users

See merge request gitlab-org/security/gitlab!1574