Skip to content

Commit bba3711

Browse files
author
GitLab Bot
committed
Add latest changes from gitlab-org/gitlab@master
1 parent 3901ed0 commit bba3711

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+347
-78
lines changed

‎app/models/ci/pipeline.rb

+11-3
Original file line numberDiff line numberDiff line change
@@ -1216,9 +1216,17 @@ def codequality_reports
12161216
end
12171217

12181218
def terraform_reports
1219-
::Gitlab::Ci::Reports::TerraformReports.new.tap do |terraform_reports|
1220-
latest_report_builds(::Ci::JobArtifact.of_report_type(:terraform)).each do |build|
1221-
build.collect_terraform_reports!(terraform_reports)
1219+
if Feature.enabled?(:show_child_reports_in_mr_page, project)
1220+
::Gitlab::Ci::Reports::TerraformReports.new.tap do |terraform_reports|
1221+
latest_report_builds_in_self_and_project_descendants(::Ci::JobArtifact.of_report_type(:terraform)).each do |build|
1222+
build.collect_terraform_reports!(terraform_reports)
1223+
end
1224+
end
1225+
else
1226+
::Gitlab::Ci::Reports::TerraformReports.new.tap do |terraform_reports|
1227+
latest_report_builds(::Ci::JobArtifact.of_report_type(:terraform)).each do |build|
1228+
build.collect_terraform_reports!(terraform_reports)
1229+
end
12221230
end
12231231
end
12241232
end

‎app/models/merge_request.rb

+5-1
Original file line numberDiff line numberDiff line change
@@ -2003,7 +2003,11 @@ def has_coverage_reports?
20032003
end
20042004

20052005
def has_terraform_reports?
2006-
diff_head_pipeline&.has_reports?(Ci::JobArtifact.of_report_type(:terraform))
2006+
if Feature.enabled?(:show_child_reports_in_mr_page, project)
2007+
diff_head_pipeline&.latest_report_builds_in_self_and_project_descendants(Ci::JobArtifact.of_report_type(:terraform))&.any?
2008+
else
2009+
diff_head_pipeline&.has_reports?(Ci::JobArtifact.of_report_type(:terraform))
2010+
end
20072011
end
20082012

20092013
def compare_accessibility_reports

‎config/feature_flags/wip/show_child_reports_in_mr_page.yml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
name: show_child_reports_in_mr_page
3+
description: Propagate artifacts in child pipelines to the merge request page
4+
feature_issue_url: https://gitlab.com/groups/gitlab-org/-/epics/4019
5+
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/189676
6+
rollout_issue_url:
7+
milestone: '18.0'
8+
group: group::pipeline execution
9+
type: wip
10+
default_enabled: false

‎db/docs/batched_background_migrations/update_require_dpop_for_manage_api_endpoints_to_false.yml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
migration_job_name: UpdateRequireDpopForManageApiEndpointsToFalse
3+
description: Batched migration to update all the existing values in the require_dpop_for_manage_api_endpoints column from true to false
4+
feature_category: system_access
5+
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/188396
6+
milestone: '18.0'
7+
queued_migration_version: 20250415203448
8+
finalized_by: # version of the migration that finalized this BBM

‎db/post_migrate/20250415203448_queue_update_require_dpop_for_manage_api_endpoints_to_false.rb

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# frozen_string_literal: true
2+
3+
class QueueUpdateRequireDpopForManageApiEndpointsToFalse < Gitlab::Database::Migration[2.2]
4+
milestone '18.0'
5+
6+
restrict_gitlab_migration gitlab_schema: :gitlab_main
7+
8+
MIGRATION = 'UpdateRequireDpopForManageApiEndpointsToFalse'
9+
10+
DELAY_INTERVAL = 2.minutes
11+
BATCH_SIZE = 1000
12+
SUB_BATCH_SIZE = 100
13+
14+
TABLE_NAME = :namespace_settings
15+
COLUMN_NAME = :namespace_id
16+
17+
# Only numeric or time-based columns can be used to divide tables for batching so,
18+
# the :namespace_id is used in place of the :require_dpop_for_manage_api_endpoints column
19+
def up
20+
queue_batched_background_migration(
21+
MIGRATION,
22+
TABLE_NAME,
23+
COLUMN_NAME,
24+
job_interval: DELAY_INTERVAL,
25+
batch_size: BATCH_SIZE,
26+
sub_batch_size: SUB_BATCH_SIZE
27+
)
28+
end
29+
30+
def down
31+
delete_batched_background_migration(MIGRATION, TABLE_NAME, COLUMN_NAME, [])
32+
end
33+
end

‎db/schema_migrations/20250415203448

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
aa3482fe2ad4d3c563567d60732e330d7f97733c98ff5e0cac3936e154f63226

‎doc/administration/appearance.md

+15-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
stage: none
33
group: unassigned
44
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
5+
gitlab_dedicated: yes
56
description: Customize your GitLab instance appearance, including logos, favicons, sign-in pages, Progressive Web App settings, system messages, and color themes.
6-
title: GitLab Appearance
7+
title: GitLab appearance
78
---
89

910
{{< details >}}
1011

1112
- Tier: Free, Premium, Ultimate
12-
- Offering: GitLab Self-Managed
13+
- Offering: GitLab Self-Managed, GitLab Dedicated
1314

1415
{{< /details >}}
1516

@@ -103,6 +104,12 @@ You can add also add a [customized help message](settings/help_page.md) below th
103104

104105
### Disable cookie-based language selector
105106

107+
{{< details >}}
108+
109+
- Offering: GitLab Self-Managed
110+
111+
{{< /details >}}
112+
106113
{{< history >}}
107114

108115
- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/144484) in GitLab 16.10.
@@ -195,6 +202,12 @@ GitLab supports [Libravatar](https://www.libravatar.org) is for avatar images, b
195202

196203
## Change the color theme for all new users
197204

205+
{{< details >}}
206+
207+
- Offering: GitLab Self-Managed
208+
209+
{{< /details >}}
210+
198211
To [change the default color theme](../user/profile/preferences.md#change-the-color-theme) for all new users:
199212

200213
1. Add `gitlab_rails['gitlab_default_theme']` to your GitLab configuration file at `/etc/gitlab/gitlab.rb`:

‎doc/administration/custom_project_templates.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
stage: Create
33
group: Source Code
44
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
5+
gitlab_dedicated: yes
56
description: Configure project templates and make them available to all projects on your GitLab instance.
67
title: Custom instance-level project templates
78
---
89

910
{{< details >}}
1011

1112
- Tier: Premium, Ultimate
12-
- Offering: GitLab Self-Managed
13+
- Offering: GitLab Self-Managed, GitLab Dedicated
1314

1415
{{< /details >}}
1516

‎doc/administration/diff_limits.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@
22
stage: Create
33
group: Source Code
44
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
5+
gitlab_dedicated: yes
56
description: Configure the maximum diff size to display on GitLab Self-Managed.
67
title: Diff limits administration
78
---
89

910
{{< details >}}
1011

1112
- Tier: Free, Premium, Ultimate
12-
- Offering: GitLab Self-Managed
13+
- Offering: GitLab Self-Managed, GitLab Dedicated
1314

1415
{{< /details >}}
1516

16-
You can set a maximum size for display of diff files (patches) in GitLab Self-Managed.
17+
You can set a maximum size for display of diff files (patches) in GitLab Self-Managed and GitLab Dedicated.
1718
[Diff limits cannot be configured](../user/gitlab_com/_index.md#diff-display-limits) on GitLab.com.
1819

1920
For details about diff files, [view changes between files](../user/project/merge_requests/changes.md).

‎doc/administration/email_from_gitlab.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
stage: none
33
group: unassigned
44
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
5+
gitlab_dedicated: yes
56
title: Email from GitLab
67
---
78

89
{{< details >}}
910

1011
- Tier: Premium, Ultimate
11-
- Offering: GitLab Self-Managed
12+
- Offering: GitLab Self-Managed, GitLab Dedicated
1213

1314
{{< /details >}}
1415

‎doc/administration/inactive_project_deletion.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
stage: Tenant Scale
33
group: Organizations
44
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
5+
gitlab_dedicated: yes
56
title: Inactive project deletion
67
---
78

89
{{< details >}}
910

1011
- Tier: Free, Premium, Ultimate
11-
- Offering: GitLab Self-Managed
12+
- Offering: GitLab Self-Managed, GitLab Dedicated
1213

1314
{{< /details >}}
1415

‎doc/administration/incoming_email.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,7 @@ Reply by email should now be working.
225225

226226
{{< alert type="note" >}}
227227

228-
This step is necessary to avoid thread deadlocks and to support the latest MailRoom features. See
229-
[this explanation](../development/emails.md#mailroom-gem-updates) for more details.
228+
This step is necessary to avoid thread deadlocks and to support the latest MailRoom features.
230229

231230
{{< /alert >}}
232231

‎doc/administration/integration/plantuml.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ To set up the integration on your GitLab Self-Managed instance, you must [config
2020

2121
After completing the integration, PlantUML converts `plantuml`
2222
blocks to an HTML image tag, with the source pointing to the PlantUML instance. The PlantUML
23-
diagram delimiters `@startuml`/`@enduml` aren't required, as these are replaced
23+
diagram delimiters `@startuml`/`@enduml` aren't required because they are replaced
2424
by the `plantuml` block:
2525

2626
- Markdown files with the extension `.md`:

‎doc/administration/labels.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
stage: Plan
33
group: Project Management
44
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
5+
gitlab_dedicated: yes
56
title: Labels administration
67
---
78

89
{{< details >}}
910

1011
- Tier: Free, Premium, Ultimate
11-
- Offering: GitLab Self-Managed
12+
- Offering: GitLab Self-Managed, GitLab Dedicated
1213

1314
{{< /details >}}
1415

‎doc/administration/merge_requests_approvals.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
stage: Create
33
group: Source Code
44
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
5+
gitlab_dedicated: yes
56
description: Configure merge request approvals for your GitLab instance.
67
title: Merge request approvals
78
---
89

910
{{< details >}}
1011

1112
- Tier: Premium, Ultimate
12-
- Offering: GitLab Self-Managed
13+
- Offering: GitLab Self-Managed, GitLab Dedicated
1314

1415
{{< /details >}}
1516

‎doc/administration/moderate_users.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
stage: Fulfillment
33
group: Provision
44
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
5+
gitlab_dedicated: yes
56
title: Moderate users
67
---
78

89
{{< details >}}
910

1011
- Tier: Free, Premium, Ultimate
11-
- Offering: GitLab Self-Managed
12+
- Offering: GitLab Self-Managed, GitLab Dedicated
1213

1314
{{< /details >}}
1415

@@ -429,6 +430,12 @@ The user is untrusted.
429430

430431
## Troubleshooting
431432

433+
{{< details >}}
434+
435+
- Offering: GitLab Self-Managed
436+
437+
{{< /details >}}
438+
432439
When moderating users, you may need to perform bulk actions on them based on certain conditions. The following rails console scripts show some examples of this. You may [start a rails console session](operations/rails_console.md#starting-a-rails-console-session) and use scripts similar to the following:
433440

434441
### Deactivate users that have no recent activity

‎doc/administration/monitoring/performance/performance_bar.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
stage: Systems
33
group: Cloud Connector
44
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
5+
gitlab_dedicated: yes
56
title: Performance bar
67
---
78

89
{{< details >}}
910

1011
- Tier: Free, Premium, Ultimate
11-
- Offering: GitLab Self-Managed
12+
- Offering: GitLab Self-Managed, GitLab Dedicated
1213

1314
{{< /details >}}
1415

‎doc/administration/monitoring/prometheus/_index.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Prometheus runs as the `gitlab-prometheus` user and listen on
4545
Each exporter is automatically set up as a
4646
monitoring target for Prometheus, unless individually disabled.
4747

48-
To disable Prometheus and all of its exporters, as well as any added in the future:
48+
To disable Prometheus and all of its exporters, and any exporters added in the future:
4949

5050
1. Edit `/etc/gitlab/gitlab.rb`
5151
1. Add or find and uncomment the following lines, making sure they are set to `false`:
@@ -65,8 +65,8 @@ To disable Prometheus and all of its exporters, as well as any added in the futu
6565

6666
{{< alert type="warning" >}}
6767

68-
Although possible, it's not recommended to change the port Prometheus listens
69-
on, as this might affect or conflict with other services running on the GitLab
68+
You can change the port Prometheus listens on, but you should not.
69+
This change might affect or conflict with other services that run on the GitLab
7070
server. Proceed at your own risk.
7171

7272
{{< /alert >}}
@@ -369,7 +369,7 @@ You can visit `http://localhost:9090` for the dashboard that Prometheus offers b
369369

370370
If SSL has been enabled on your GitLab instance, you may not be able to access
371371
Prometheus on the same browser as GitLab if using the same FQDN due to [HSTS](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security).
372-
[A test project exists](https://gitlab.com/gitlab-org/multi-user-prometheus) to provide access via GitLab, but in the interim there are
372+
[A GitLab test project exists](https://gitlab.com/gitlab-org/multi-user-prometheus) to provide access, but in the interim there are
373373
some workarounds: using a separate FQDN, using server IP, using a separate browser for Prometheus, resetting HSTS, or
374374
having [NGINX proxy it](https://docs.gitlab.com/omnibus/settings/nginx.html#inserting-custom-nginx-settings-into-the-gitlab-server-block).
375375

‎doc/administration/operations/fast_ssh_key_lookup.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ To set up fast lookup with OpenSSH:
101101
- Self-compiled installations: If you followed the instructions for
102102
[installing GitLab Shell from source](../../install/installation.md#install-gitlab-shell), the command should be
103103
located at `/home/git/gitlab-shell/bin/gitlab-shell-authorized-keys-check`.
104-
Consider creating a wrapper script somewhere else, as this command must be owned by `root`,
104+
Consider creating a wrapper script somewhere else because this command must be owned by `root`,
105105
and not be writable by a group or others.
106106
Also consider changing the ownership of this command as needed, but this might require temporary
107107
ownership changes during `gitlab-shell` upgrades.
@@ -126,7 +126,7 @@ To set up fast lookup with OpenSSH:
126126
```
127127

128128
A successful pull or [welcome message](../../user/ssh.md#verify-that-you-can-connect)
129-
means that GitLab found the key in the database, as the key is not present in the file.
129+
means that GitLab found the key in the database because the key is not present in the file.
130130

131131
If there are lookup failures, the `authorized_keys` file is still scanned.
132132
Git SSH performance might still be slow for many users, as long as the large file exists.
@@ -172,7 +172,7 @@ GitLab supports `authorized_keys` database lookups with [SELinux](https://en.wik
172172
173173
Because the SELinux policy is static, GitLab doesn't support changing
174174
internal web server ports. Administrators would have to create a special `.te`
175-
file for the environment, as it isn't generated dynamically.
175+
file for the environment because it isn't generated dynamically.
176176
177177
### Additional documentation
178178

‎doc/administration/operations/rails_console.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ user.password_confirmation = 'hunter2'
530530
user.save!(validate: false)
531531
```
532532

533-
This is not recommended, as validations are usually put in place to ensure the
533+
This is not recommended because validations are usually put in place to ensure the
534534
integrity and consistency of user-provided data.
535535

536536
A validation error prevents the entire object from being saved to

‎doc/administration/reporting/git_abuse_rate_limit.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
stage: Software Supply Chain Security
33
group: Authorization
44
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
5+
gitlab_dedicated: yes
56
title: Git abuse rate limit (administration)
67
---
78

89
{{< details >}}
910

1011
- Tier: Ultimate
11-
- Offering: GitLab Self-Managed
12+
- Offering: GitLab Self-Managed, GitLab Dedicated
1213

1314
{{< /details >}}
1415

0 commit comments

Comments
 (0)