Add Issue.relatedMergeRequests to GraphQL API

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107804



Merged-by: Heinrich Lee Yu <heinrich@gitlab.com>
Approved-by: Brian Williams <bwilliams@gitlab.com>
Approved-by: Phillip Wells <pwells@gitlab.com>
Approved-by: Heinrich Lee Yu <heinrich@gitlab.com>
Reviewed-by: Niklas <mc.taucher2003@gmail.com>
Reviewed-by: Brian Williams <bwilliams@gitlab.com>
Co-authored-by: Niklas <mc.taucher2003@gmail.com>

Refactor initializer arguments for Issuable::DestroyService

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111813



Merged-by: Jan Provaznik <jprovaznik@gitlab.com>
Approved-by: Mario Celi <mcelicalderon@gitlab.com>
Approved-by: Jan Provaznik <jprovaznik@gitlab.com>
Co-authored-by: Alexandru Croitor <acroitor@gitlab.com>

Pass the correct container object for DORA metrics

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111916



Merged-by: Pavel Shutsin <pshutsin@gitlab.com>
Approved-by: Serena Fang <sfang@gitlab.com>
Approved-by: Pavel Shutsin <pshutsin@gitlab.com>
Reviewed-by: Serena Fang <sfang@gitlab.com>
Co-authored-by: Adam Hegyi <ahegyi@gitlab.com>

Merge branch '384936-fallback-to-license-scanning-sbom-scanner-when-no-license-scanning-artifacts' into 'master'

Add behavior to fallback to SBoM license scanning

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111699



Merged-by: Tetiana Chupryna <tchupryna@gitlab.com>
Approved-by: Fabien Catteau <fcatteau@gitlab.com>
Approved-by: Tetiana Chupryna <tchupryna@gitlab.com>
Co-authored-by: Oscar Tovar <otovar@gitlab.com>

Oscar Tovar authored 2 years ago and Tetiana Chupryna committed 2 years ago

When the license scanning sbom scanner FF
is enabled, the license_scanning artifacts
should be prioritized over the SBOM reports.
When finding the scanner for a project, we
determine this by returning the scanner that
has the most recent data. For pipelines, we
first check if it has a license_scanning report
and then fallback to using an SBoM scanner.

Improve web-hook failure state cache

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111097



Merged-by: Andy Soiron <asoiron@gitlab.com>
Approved-by: Tianwen Chen <tchen@gitlab.com>
Approved-by: Andy Soiron <asoiron@gitlab.com>
Reviewed-by: Andy Soiron <asoiron@gitlab.com>
Reviewed-by: Bojan Marjanovic <bmarjanovic@gitlab.com>
Reviewed-by: Tianwen Chen <tchen@gitlab.com>
Co-authored-by: bmarjanovic <bmarjanovic@gitlab.com>
Co-authored-by: Alex Kalderimis <alex.kalderimis@gmail.com>

Alexis Kalderimis authored 2 years ago and Andy Soiron committed 2 years ago

This makes the following changes:

- uses the Redis shared state rather than the rails cache, to allow
  touching the cache from more places safely
- intelligently sets the cached value of any-hook-failed when a hook
  succeeds or fails. If it succeeds, then if the state was previously
  failing, we query sibling hooks to possibly clear it. If it is now
  failing, we don't have to do that query, and can safely mark it as
  failed.

Why do we do this?

- These changes ensure that if a hook fails, the cache is invalidated
  immediately, and if a hook succeeds, the staet is is cleared so that
  users do not see irrelevant notifications
- Additionally, this reduces the time between a hook failing and any
  notiication being shown to users.

Refactor initializer arguments for Issuable::Clone::BaseService

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111814



Merged-by: Jan Provaznik <jprovaznik@gitlab.com>
Approved-by: Mario Celi <mcelicalderon@gitlab.com>
Approved-by: Jan Provaznik <jprovaznik@gitlab.com>
Co-authored-by: Alexandru Croitor <acroitor@gitlab.com>

Add mirror branches filter

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102499



Merged-by: Coung Ngo <cngo@gitlab.com>
Approved-by: Nataliia Radina <nradina@gitlab.com>
Approved-by: Michael Le <mle@gitlab.com>
Approved-by: Vasilii Iakliushin <viakliushin@gitlab.com>
Approved-by: Costel Maxim <cmaxim@gitlab.com>
Approved-by: Coung Ngo <cngo@gitlab.com>
Reviewed-by: Kushal Pandya <kushal@gitlab.com>
Reviewed-by: Vasilii Iakliushin <viakliushin@gitlab.com>
Reviewed-by: Niklas <mc.taucher2003@gmail.com>
Co-authored-by: Kun Qian <kunqian@jihulab.com>

Refactored method of updating Ukraine country name

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111833



Merged-by: Dmitry Gruzd <dgruzd@gitlab.com>
Approved-by: Mario Celi <mcelicalderon@gitlab.com>
Approved-by: Dmitry Gruzd <dgruzd@gitlab.com>
Co-authored-by: Ross Byrne <robyrne@gitlab.com>

Update Gitaly version

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112028



Merged-by: release-tools approver bot <project278964_bot6@example.com>
Approved-by: release-tools approver bot <project278964_bot6@example.com>
Co-authored-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>

Show version check in new Help menu

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110786



Merged-by: Coung Ngo <cngo@gitlab.com>
Approved-by: Nick Leonard <nleonard@gitlab.com>
Approved-by: Coung Ngo <cngo@gitlab.com>
Reviewed-by: Doug Stull <dstull@gitlab.com>
Reviewed-by: Coung Ngo <cngo@gitlab.com>
Reviewed-by: Nick Leonard <nleonard@gitlab.com>
Co-authored-by: Thomas Hutterer <thutterer@gitlab.com>

Redirect to successful verification page after completed steps

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111057



Merged-by: Mikołaj Wawrzyniak <mwawrzyniak@gitlab.com>
Approved-by: Eugie Limpin <elimpin@gitlab.com>
Approved-by: Scott de Jonge <sdejonge@gitlab.com>
Approved-by: Jose Ivan Vargas <jvargas@gitlab.com>
Approved-by: Jessie Young <jessieyoung@gitlab.com>
Approved-by: Mikołaj Wawrzyniak <mwawrzyniak@gitlab.com>
Reviewed-by: Jose Ivan Vargas <jvargas@gitlab.com>
Reviewed-by: Alex Buijs <abuijs@gitlab.com>
Reviewed-by: Mikołaj Wawrzyniak <mwawrzyniak@gitlab.com>
Reviewed-by: Jessie Young <jessieyoung@gitlab.com>
Reviewed-by: Scott de Jonge <sdejonge@gitlab.com>
Co-authored-by: Alex Buijs <abuijs@gitlab.com>

Alex Buijs authored 2 years ago and Mikołaj Wawrzyniak committed 2 years ago

Redirect to the success_identity_verification_path from the frontend
when all verification steps have been completed.

Changelog: changed
EE: true

Filter duplicated downstreams in mini pipeline graph using REST

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111014



Merged-by: Matthias Käppler <mkaeppler@gitlab.com>
Approved-by: Briley Sandlin <bsandlin@gitlab.com>
Approved-by: Matthias Käppler <mkaeppler@gitlab.com>
Reviewed-by: Miguel Rincon <mrincon@gitlab.com>
Reviewed-by: Matthias Käppler <mkaeppler@gitlab.com>
Reviewed-by: Mireya Andres <mandres@gitlab.com>
Reviewed-by: Anna Vovchenko <avovchenko@gitlab.com>
Co-authored-by: Mireya Andres <mandres@gitlab.com>

Mireya Gen Andres authored 2 years ago and Matthias Käppler committed 2 years ago

This updates the mini pipeline graph for the MR widget and the
pipelines table.

Changelog: fixed

Log error in ActiveSupport cache via error_handler

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111807



Merged-by: George Koltsov <gkoltsov@gitlab.com>
Approved-by: Bob Van Landuyt <bob@gitlab.com>
Approved-by: George Koltsov <gkoltsov@gitlab.com>
Reviewed-by: Bob Van Landuyt <bob@gitlab.com>
Co-authored-by: Sylvester Chin <schin@gitlab.com>

Add dismiss-with-comment to GraphQL finding modal

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111903



Merged-by: Phil Hughes <me@iamphill.com>
Approved-by: Savas Vedova <svedova@gitlab.com>
Approved-by: Phil Hughes <me@iamphill.com>
Co-authored-by: Dave Pisek <dpisek@gitlab.com>

This MR fix flake test for saved on-demand scans

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111945



Merged-by: Anna Vovchenko <avovchenko@gitlab.com>
Approved-by: Ross Byrne <robyrne@gitlab.com>
Approved-by: Anna Vovchenko <avovchenko@gitlab.com>
Reviewed-by: Artur Fedorov <afedorov@gitlab.com>
Co-authored-by: Artur Fedorov <afedorov@gitlab.com>

Announce deprecation of `external` in GraphQL ReleaseAssetLink type

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/109704



Merged-by: Russell Dickenson <rdickenson@gitlab.com>
Approved-by: Vladimir Shushlin <vshushlin@gitlab.com>
Approved-by: Russell Dickenson <rdickenson@gitlab.com>
Co-authored-by: Ahmed Hemdan <ahemdan@gitlab.com>

Enable advanced user search regardless of namespace

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111448



Merged-by: John Mason <9717668-john-mason@users.noreply.gitlab.com>
Approved-by: Ravi Kumar <rkumar@gitlab.com>
Approved-by: John Mason <9717668-john-mason@users.noreply.gitlab.com>
Co-authored-by: maddievn <mvanniekerk@gitlab.com>

Encrypt trigger tokens in DB

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110254



Merged-by: Matthias Käppler <mkaeppler@gitlab.com>
Approved-by: Max Orefice <morefice@gitlab.com>
Approved-by: Matthias Käppler <mkaeppler@gitlab.com>
Reviewed-by: Alex Pooley <apooley@gitlab.com>
Reviewed-by: Matthias Käppler <mkaeppler@gitlab.com>
Reviewed-by: Max Orefice <morefice@gitlab.com>
Reviewed-by: Diogo Frazão <dfrazao@gitlab.com>
Reviewed-by: Kasia Misirli <kmisirli@gitlab.com>
Co-authored-by: Kasia Misirli <kmisirli@gitlab.com>

Kasia Misirli authored 2 years ago and Matthias Käppler committed 2 years ago

Changelog: fixed

Add background_migration pg12 to update-tests-metadata job

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111937



Merged-by: Rémy Coutable <remy@rymai.me>
Approved-by: Rémy Coutable <remy@rymai.me>
Reviewed-by: Rémy Coutable <remy@rymai.me>
Co-authored-by: Alina Mihaila <amihaila@gitlab.com>

Merge branch '391088-fix-spec-violations-in-spec-frontend-projects-settings-components-new_access_dropdown_spec-js' into 'master'

Fix spec violations in new_access_dropdown_spec.js

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111913



Merged-by: Mark Florian <mflorian@gitlab.com>
Approved-by: Mark Florian <mflorian@gitlab.com>
Reviewed-by: Mark Florian <mflorian@gitlab.com>
Co-authored-by: Martin Wortschack <mwortschack@gitlab.com>

Add more fields to OAuthID token

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110922



Merged-by: Ahmed Hemdan <ahemdan@gitlab.com>
Approved-by: Aakriti Gupta <agupta@gitlab.com>
Approved-by: Ahmed Hemdan <ahemdan@gitlab.com>
Reviewed-by: Ahmed Hemdan <ahemdan@gitlab.com>
Co-authored-by: Joseph Wambua <jjoshua@gitlab.com>

Quarantine flaky test for group roadmap

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112014



Merged-by: Jan Provaznik <jprovaznik@gitlab.com>
Approved-by: Jan Provaznik <jprovaznik@gitlab.com>
Co-authored-by: Alina Mihaila <amihaila@gitlab.com>

Announce deprecation of `external` field in Releases/Release Links APIs

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/109705



Merged-by: Russell Dickenson <rdickenson@gitlab.com>
Approved-by: Vladimir Shushlin <vshushlin@gitlab.com>
Approved-by: Russell Dickenson <rdickenson@gitlab.com>
Co-authored-by: Ahmed Hemdan <ahemdan@gitlab.com>

Rework with_disabled_database_connections to work with Rails 7.0

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111399



Merged-by: Ethan Urie <eurie@gitlab.com>
Approved-by: Rutger Wessels <rwessels@gitlab.com>
Approved-by: Ethan Urie <eurie@gitlab.com>
Reviewed-by: Rutger Wessels <rwessels@gitlab.com>
Co-authored-by: Thong Kuah <tkuah@gitlab.com>

Thong Kuah authored 2 years ago and Ethan Urie committed 2 years ago

In Rails 7.0, `attribute` definitions in models now run at class
definition time, and calls model.connection_db_config. This means
swapping the connection_handler now breaks because there's no valid
connection_pool within with_disabled_database_connections block.

On investigation, `.connection_pool`, and `.connection_db_config` does
not create a database connection (model.connection does).

In order to have this keep working in Rails 7.0, we switch to counting
the number of connections before, and after instead. Also to prevent
re-use of connections, we also disconnect all active connections first.

Merge branch '390577-sidekiqloadbalancing-workerdataconsistency-cop-link-does-not-work' into 'master'

Add correct help link for SidekiqLoadBalancing/WorkerDataConsistency Cop

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112016



Merged-by: Peter Leitzen <pleitzen@gitlab.com>
Approved-by: Peter Leitzen <pleitzen@gitlab.com>
Co-authored-by: Marc Saleiko <msaleiko@gitlab.com>