[merge-train skip]

[ci skip]

Use tag helper for javascript tag in redirect

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

This will automatically include the nonce for CSP

Bump BinData version

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

Changelog: security

Updates authorization for lint

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

Adds redirect page to OAuth

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

Block access to gitlab for users with expired password

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

Limit rotations when removing members to those accessible to the member

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

OAuth implicit grant access tokens are not logged

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

Use xpath instead of css for searching in banzai [RUN AS-IF-FOSS]

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

Truncate all non-blob markdown to 1MB by default

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

Merge branch 'security-dblessing_update_users_two_factor_required_from_group-13-12' into '13-12-stable-ee'

Update users two factor required from group

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

Opt in to Atlassians new context qsh

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

Merge branch 'security-297665-validate-commit-author-for-x509-signatures-13-12-ee' into '13-12-stable-ee'

Only verify commit signatures if the user email is verified

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

Prevent XSS on notebooks

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

Cherry-pick !62553 into 13-12-stable-ee

See merge request gitlab-org/gitlab!62563

Changelog: security

The goal is to make sure the user to go through js-based redirect

Changelog: security

[merge-train skip]

[ci skip]

[ci skip]

Prepare 13.12.1-ee release

See merge request gitlab-org/gitlab!62466

Remove db changelog requirement from danger

See merge request gitlab-org/gitlab!62493

Alexis Kalderimis authored 3 years ago and Mayra Cabrera committed 3 years ago

This backports the fix from
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62054
into 13.12

Vitali Tatarintev authored 3 years ago and Mayra Cabrera committed 3 years ago

Fix a flaky test by waiting for all requests before clicking

See merge request gitlab-org/gitlab!62099

(cherry picked from commit 59ae7774)

6f181d1f Fix a flaky test by waiting for all requests before clicking

Kerri Miller authored 3 years ago and Mayra Cabrera committed 3 years ago

Handle nil Content-Type in Service Desk emails

See merge request gitlab-org/gitlab!62408

(cherry picked from commit 692580fe)

ff555d25 Handle nil Content-Type in Service Desk emails

Alexis Kalderimis authored 3 years ago and Mayra Cabrera committed 3 years ago

Fix the Create new cluster feature

See merge request gitlab-org/gitlab!62341

(cherry picked from commit 4b489b16)

7cda7fdb Pin the GKE version to 1.18 for cluster creation
9b1cca77 Prefer 'issue' to 'problem'

Changelog: fixed

Vitaly Slobodin authored 3 years ago and Mayra Cabrera committed 3 years ago

Fix pipeline security tab scanner filter not working

See merge request gitlab-org/gitlab!62276

(cherry picked from commit 3443f46b)

77cc57a6 Fix pipeline security tab scanner filter not working

Changelog: fixed

Changelog: security

Fix rubocop offence

Add specs for new method

Fix typo in spec title

The new changelog workflow deprecates changelog file entries, this
commits updates changelog.rb not to fail if a changelog entry is not
included when a database migration is added

Related to https://gitlab.com/gitlab-com/gl-infra/delivery/-/issues/1767

Drew Blessing authored 3 years ago and Drew Blessing committed 3 years ago

A background migration to ensure users have the correct setting
when two factor is required by a group they're a member of. A
prior bug caused this setting to be incorrect. That bug is fixed
going forward and this is a one-time fix for existing cases.

Changelog: security

* Force some form of authentication in order to access the lint
endpoint for unauthenticated users on GitLab instances with restrictions
* Adds a method for determining if registration on an instance is
limited based on the above
* Adds specs for all the cases mentioned above

Changelog: security

Alper Akgun authored 3 years ago and GitLab Release Tools Bot committed 3 years ago

Create 13.12 What's New entry

See merge request gitlab-org/gitlab!62247

(cherry picked from commit 23f945c4)

cd00ce83 Create 13.12 What's New entry
531830d0 Switch release to verify to fix linting error
214e9202 Update 202105220001_13_12.yml
83b8ec1d Adjust GA wording based on Sid feedback
e6e99973 Switch generic images to new ones that render better
b947070d Fix FLOC URL
ddb11240 Update delete packages in API doc link

Suzanne Selhorn authored 3 years ago and GitLab Release Tools Bot committed 3 years ago

Add documentation for the FLoC feature

See merge request gitlab-org/gitlab!62210

(cherry picked from commit 1edd2c44)

21f0e9b1 Add documentation for the FLoC feature
490187e9 Apply 1 suggestion(s) to 1 file(s)

Kati Paizee authored 3 years ago and GitLab Release Tools Bot committed 3 years ago

Note the results limit disable feature flag will be removed

See merge request gitlab-org/gitlab!62062

(cherry picked from commit 8288217e)

302e3bb0 Note the results limit disable feature flag will be removed

Kati Paizee authored 3 years ago and GitLab Release Tools Bot committed 3 years ago

Add deprecation notice for implicit grant flow

See merge request gitlab-org/gitlab!62061

(cherry picked from commit 31a69eb7)

6dd45015 Add deprecation notice for implicit grant flow

Russell Dickenson authored 3 years ago and GitLab Release Tools Bot committed 3 years ago

Document new Vulnerability Report vendor option in the Scanner filter

See merge request gitlab-org/gitlab!61656

(cherry picked from commit 05c95010)

49e95625 Document VR report vendor filter
bb1d166b Change order of instruction
3d8ec142 Apply 2 suggestion(s) to 1 file(s)
32cb4520 Apply 2 suggestion(s) to 1 file(s)
ccc9e0bf Apply 2 suggestion(s) to 1 file(s)