Changelog: other
EE: true

Fix group wiki activity events breaking the user activity feed

See merge request !171652



Merged-by: Alexandru Croitor <acroitor@gitlab.com>
Approved-by: Alexandru Croitor <acroitor@gitlab.com>
Approved-by: Vladimir Shushlin <vshushlin@gitlab.com>
Reviewed-by: Vladimir Shushlin <vshushlin@gitlab.com>
Reviewed-by: Alexandru Croitor <acroitor@gitlab.com>
Co-authored-by: Piotr Skorupa <pskorupa@gitlab.com>

Log current organization_id

See merge request !171256



Merged-by: Marcos Rocha <mrocha@gitlab.com>
Approved-by: david hamp-gonsalves <dhamp-gonsalves@gitlab.com>
Approved-by: Marcos Rocha <mrocha@gitlab.com>
Reviewed-by: david hamp-gonsalves <dhamp-gonsalves@gitlab.com>
Co-authored-by: Shane Maglangit <smaglangit@gitlab.com>

Changelog: added

Throttle ProcessCommitWorker globally and per-push

See merge request !171786



Merged-by: Dmitry Gruzd <dgruzd@gitlab.com>
Approved-by: Vasilii Iakliushin <viakliushin@gitlab.com>
Approved-by: Dmitry Gruzd <dgruzd@gitlab.com>
Co-authored-by: Fred Reinink <freinink@gitlab.com>

Changelog: security

Remove "[Feature flag] Rollout of `no_locking_for_stop_actions`"

See merge request !171708



Merged-by: Dmitry Gruzd <dgruzd@gitlab.com>
Approved-by: Pedro Pombeiro <noreply@pedro.pombei.ro>
Approved-by: Buck O'Leary <bucoleary@gitlab.com>
Approved-by: Dmitry Gruzd <dgruzd@gitlab.com>
Reviewed-by: Pedro Pombeiro <noreply@pedro.pombei.ro>
Co-authored-by: Daniel Prause <dprause@gitlab.com>

Don't change MR closing issues if MR is set to auto merge

See merge request !171721



Merged-by: Roy Zwambag <rzwambag@gitlab.com>
Approved-by: Ian Anderson <ianderson@gitlab.com>
Approved-by: Greg Alfaro <galfaro@gitlab.com>
Approved-by: Roy Zwambag <rzwambag@gitlab.com>
Reviewed-by: Amy Qualls <aqualls@gitlab.com>
Co-authored-by: Amy Qualls <aqualls@gitlab.com>
Co-authored-by: Mario Celi <mcelicalderon@gitlab.com>

To prevent malicious changes to the list of Issues that
will be closed when a merge request is merged,
we are preventing changes to this list after the merging user
has enabled auto merge in the merge request

Changelog: fixed

Adds UI elements for deprecated packages

See merge request !170435



Merged-by: Deepika Guliani <dguliani@gitlab.com>
Approved-by: Anna Vovchenko <avovchenko@gitlab.com>
Approved-by: Deepika Guliani <dguliani@gitlab.com>
Reviewed-by: Anna Vovchenko <avovchenko@gitlab.com>
Reviewed-by: Rahul Chanila <rchanila@gitlab.com>
Co-authored-by: Rahul Chanila <rchanila@gitlab.com>

Fix typo that changed meaning

See merge request !171804



Merged-by: Fabio Pitino <fpitino@gitlab.com>
Approved-by: Fabio Pitino <fpitino@gitlab.com>
Co-authored-by: Marcel Amirault <mamirault@gitlab.com>

Map backend model names to humanized versions for UI display

See merge request !171064



Merged-by: Eduardo Bonet <ebonet@gitlab.com>
Approved-by: Serhii Yarynovskyi <syarynovskyi@gitlab.com>
Approved-by: Eduardo Bonet <ebonet@gitlab.com>
Reviewed-by: Ethan Urie <eurie@gitlab.com>
Reviewed-by: Serhii Yarynovskyi <syarynovskyi@gitlab.com>
Reviewed-by: Julie Huang <julhuang@gitlab.com>
Co-authored-by: Julie Huang <julhuang@gitlab.com>

Drop NOT NULL constraint on p_ci_build_sources source column

See merge request !171010



Merged-by: Gregory Havenga <11164960-ghavenga@users.noreply.gitlab.com>
Approved-by: Irina Bronipolsky <ibronipolsky@gitlab.com>
Approved-by: Max Fan <mfan@gitlab.com>
Approved-by: Gregory Havenga <11164960-ghavenga@users.noreply.gitlab.com>
Co-authored-by: Aaron Huntsman <ahuntsman@gitlab.com>

Use 24 hours lease time

See merge request !171695



Merged-by: Vijay Hawoldar <vhawoldar@gitlab.com>
Approved-by: Suraj Tripathi <stripathi@gitlab.com>
Approved-by: Vijay Hawoldar <vhawoldar@gitlab.com>
Co-authored-by: Bishwa Hang Rai <bhrai@gitlab.com>

Fix docs links in Ruby files

See merge request !171639



Merged-by: James Nutt <jnutt@gitlab.com>
Approved-by: Marcel Amirault <mamirault@gitlab.com>
Approved-by: James Nutt <jnutt@gitlab.com>
Reviewed-by: Marcel Amirault <mamirault@gitlab.com>
Co-authored-by: Ashraf Khamis <akhamis@gitlab.com>

Update gitlab-workspace-tools container image

See merge request !171557



Merged-by: Alper Akgun <aakgun@gitlab.com>
Approved-by: Alper Akgun <aakgun@gitlab.com>
Co-authored-by: Vishal Tak <vtak@gitlab.com>

Store IDs for group exceptions with group_protected_branch features

See merge request !171606



Merged-by: Sashi Kumar Kumaresan <skumar@gitlab.com>
Approved-by: Martin Čavoj <mcavoj@gitlab.com>
Approved-by: Sashi Kumar Kumaresan <skumar@gitlab.com>
Reviewed-by: Martin Čavoj <mcavoj@gitlab.com>
Co-authored-by: Alan (Maciej) Paruszewski <mparuszewski@gitlab.com>

Fix Layout/LineLength offenses

See merge request !170710



Merged-by: Piotr Skorupa <pskorupa@gitlab.com>
Approved-by: Tian Gao <tgao@gitlab.com>
Approved-by: Piotr Skorupa <pskorupa@gitlab.com>
Reviewed-by: Piotr Skorupa <pskorupa@gitlab.com>
Co-authored-by: Alexander Ikonomou <alexander.ikonomou.19@proton.me>

Update Metric API endpoint to return tiers in the metric definition files

See merge request !171392



Merged-by: Mark Chao <mchao@gitlab.com>
Approved-by: Jonas Larsen <jlarsen@gitlab.com>
Approved-by: Mark Chao <mchao@gitlab.com>
Reviewed-by: Jonas Larsen <jlarsen@gitlab.com>
Co-authored-by: Nwanna Isong <nisong@gitlab.com>

Merge branch '500360-investigate-why-some-items-are-missing-from-project-vsa-stage-part-2' into 'master' 

Introduces new model for storing VSA stage aggregation metadata

See merge request !170988



Merged-by: Omar Qunsul <oqunsul@gitlab.com>
Approved-by: Keeyan Nejad <knejad@gitlab.com>
Approved-by: Fabien Catteau <fcatteau@gitlab.com>
Approved-by: Alejandro Rodríguez <alejandro@gitlab.com>
Approved-by: Omar Qunsul <oqunsul@gitlab.com>
Reviewed-by: Fabien Catteau <fcatteau@gitlab.com>
Reviewed-by: Pavel Shutsin <pshutsin@gitlab.com>
Reviewed-by: Omar Qunsul <oqunsul@gitlab.com>
Reviewed-by: Keeyan Nejad <knejad@gitlab.com>
Co-authored-by: Pavel Shutsin <pshutsin@gitlab.com>

Remove BAS security configuration option

See merge request !169563



Merged-by: Pam Artiaga <partiaga@gitlab.com>
Approved-by: Fernando Cardenas <14022659-fernando-c@users.noreply.gitlab.com>
Approved-by: Arpit Gogia <12347103-arpitgogia@users.noreply.gitlab.com>
Approved-by: Pam Artiaga <partiaga@gitlab.com>
Co-authored-by: Dheeraj Joshi <djoshi@gitlab.com>

The feature was removed in 17.0. This removes the
option from the security configuration UI.

Changelog: removed
EE: true

Prepare common Vue app for Repository header area

See merge request !167906



Merged-by: Phil Hughes <me@iamphill.com>
Approved-by: Sarah Yasonik <syasonik@gitlab.com>
Approved-by: Olaoluwa Oluro <olaoluro@gitlab.com>
Approved-by: Chaoyue Zhao <czhao@gitlab.com>
Approved-by: Phil Hughes <me@iamphill.com>
Reviewed-by: Phil Hughes <me@iamphill.com>
Reviewed-by: Jacques Erasmus <jerasmus@gitlab.com>
Reviewed-by: Chaoyue Zhao <czhao@gitlab.com>
Reviewed-by: Duo Code Reviewer <duo-code-review-bot@gitlab.com>
Co-authored-by: Jacques <jerasmus@gitlab.com>
Co-authored-by: psjakubowska <psedlak-jakubowska@gitlab.com>

Create the base for header area app to be used
on tree and blob view. Move tree History control.
Add a check to initiate old History control only
when its element is present.

Add popover to AI-badge for MR-security-widget

See merge request !171539



Merged-by: Savas Vedova <svedova@gitlab.com>
Approved-by: Savas Vedova <svedova@gitlab.com>
Reviewed-by: Savas Vedova <svedova@gitlab.com>
Co-authored-by: Dave Pisek <dpisek@gitlab.com>

Update specs for #show_active_user_count_threshold_banner?

See merge request !171512



Merged-by: Vijay Hawoldar <vhawoldar@gitlab.com>
Approved-by: David Dieulivol <ddieulivol@gitlab.com>
Reviewed-by: David Dieulivol <ddieulivol@gitlab.com>
Co-authored-by: Angelo Gulina <agulina@gitlab.com>

Removing generally available note

See merge request !171701



Merged-by: Eduardo Bonet <ebonet@gitlab.com>
Approved-by: Eduardo Bonet <ebonet@gitlab.com>
Co-authored-by: Suzanne Selhorn <sselhorn@gitlab.com>

New Crowdin updates

See merge request !171710



Merged-by: Martin Wortschack <mwortschack@gitlab.com>
Approved-by: Bob Van Landuyt <bob@gitlab.com>
Co-authored-by: GitLab Crowdin Bot <opysaryuk+crowdinbot@gitlab.com>

[skip ci]

Currently, for group wiki activity feed events created in
EventCreateService, neither group_id, nor project_id is set, ending up
with bad state and this breaks the user activity feed when a user has
an event related to a group wiki.

This fixes resource_parent for WikiPage::Meta to point to its namespace
for group wiki records, which have namespace rather than project
present.

This also fixes setting group_id for group wiki activity feed events,
fixes linking to group wikis, and if neither group_id nor project_id
is present, we return no link instead.

Changelog: fixed

AI-suggestion: link to correct docs

See merge request !171574



Merged-by: David Pisek <dpisek@gitlab.com>
Approved-by: Subashis Chakraborty <schakraborty@gitlab.com>

Quarantine a flaky test

See merge request !171489



Merged-by: Gavin Hinfey <ghinfey@gitlab.com>
Approved-by: Sarah Yasonik <syasonik@gitlab.com>
Approved-by: Gavin Hinfey <ghinfey@gitlab.com>
Co-authored-by: Auto-quarantining bot <gitlab-auto-quarantine-bot@gitlab.com>

Quarantine a flaky test

See merge request !171490



Merged-by: Gavin Hinfey <ghinfey@gitlab.com>
Approved-by: Sarah Yasonik <syasonik@gitlab.com>
Approved-by: Gavin Hinfey <ghinfey@gitlab.com>
Co-authored-by: Auto-quarantining bot <gitlab-auto-quarantine-bot@gitlab.com>