Add latest changes from gitlab-org/gitlab@master

app/mailers/emails/projects.rb

@@ -59,6 +59,7 @@ module Emails
     def prometheus_alert_fired_email(project, user, alert)
       @project = project
       @alert = alert.present
+      @incident = alert.issue
 
       add_project_headers
       add_alert_headers
@@ -80,11 +81,10 @@ module Emails
     end
 
     def add_incident_headers
-      incident = @alert.issue
+      return unless @incident
-      return unless incident
 
-      headers['X-GitLab-Incident-ID'] = incident.id
+      headers['X-GitLab-Incident-ID'] = @incident.id
-      headers['X-GitLab-Incident-IID'] = incident.iid
+      headers['X-GitLab-Incident-IID'] = @incident.iid
     end
   end
 end

config/feature_flags/development/incident_escalations.yml

@@ -0,0 +1,8 @@
+---
+name: incident_escalations
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74337
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345769
+milestone: '14.6'
+type: development
+group: group::monitor
+default_enabled: false

config/feature_flags/development/vulnerability_location_image_filter.yml

@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340915
 milestone: '14.4'
 type: development
 group: group::container security
-default_enabled: false
+default_enabled: true

config/sidekiq_queues.yml

@@ -205,6 +205,8 @@
   - 1
 - - incident_management_pending_escalations_alert_create
   - 1
+- - incident_management_pending_escalations_issue_check
+  - 1
 - - integrations_create_external_cross_reference
   - 1
 - - invalid_gpg_signature_update

doc/administration/instance_limits.md

@@ -855,7 +855,8 @@ The default maximum file size for a package that's uploaded to the [GitLab Packa
 - PyPI: 3 GB
 - Terraform: 1 GB
 
-The [maximum file sizes on GitLab.com](../user/gitlab_com/index.md) might be different.
+The [maximum file sizes on GitLab.com](../user/gitlab_com/index.md#package-registry-limits)
+might be different.
 
 To set these limits for a self-managed installation, run the following in the
 [GitLab Rails console](operations/rails_console.md#starting-a-rails-console-session):

doc/api/jobs.md

@@ -806,6 +806,10 @@ Example of response
 }
 ```
 
+NOTE:
+You can't delete archived jobs with the API, but you can
+[delete job artifacts and logs from jobs completed before a specific date](../administration/job_artifacts.md#delete-job-artifacts-and-logs-from-jobs-completed-before-a-specific-date)
+
 ## Play a job
 
 Triggers a manual action to start a job.

doc/user/gitlab_com/index.md

@@ -149,16 +149,16 @@ The [maximum file size](../../administration/instance_limits.md#file-size-limits
 for a package uploaded to the [GitLab Package Registry](../../user/packages/package_registry/index.md)
 varies by format:
 
-| Package type | GitLab.com | Default |
+| Package type | GitLab.com |
-|--------------|------------|---------|
+|--------------|------------|
-| Conan        | 5 GB       | 3 GB    |
+| Conan        | 5 GB       |
-| Generic      | 5 GB       | 5 GB    |
+| Generic      | 5 GB       |
-| Helm         | 5 MB       | 5 MB    |
+| Helm         | 5 MB       |
-| Maven        | 5 GB       | 3 GB    |
+| Maven        | 5 GB       |
-| npm:         | 5 GB       | 500 MB  |
+| npm:         | 5 GB       |
-| NuGet        | 5 GB       | 500 MB  |
+| NuGet        | 5 GB       |
-| PyPI         | 5 GB       | 3 GB    |
+| PyPI         | 5 GB       |
-| Terraform    | 1 GB       | 1 GB    |
+| Terraform    | 1 GB       |
 
 ## Account and limit settings
 

doc/user/group/saml_sso/index.md

@@ -349,6 +349,11 @@ Ensure your SAML identity provider sends an attribute statement named `Groups` o
 </saml:AttributeStatement>
 ```
 
+Other attribute names such as `http://schemas.microsoft.com/ws/2008/06/identity/claims/groups`
+are not accepted as a source of groups.
+See the [SAML troubleshooting page](../../../administration/troubleshooting/group_saml_scim.md)
+for examples on configuring the required attribute name in the SAML identity provider's settings.
+
 NOTE:
 The value for `Groups` or `groups` in the SAML response can be either the group name or the group ID.
 To inspect the SAML response, you can use one of these [SAML debugging tools](#saml-debugging-tools).

locale/gitlab.pot

@@ -3991,6 +3991,12 @@ msgstr ""
 msgid "An example showing how to use Jsonnet with GitLab dynamic child pipelines"
 msgstr ""
 
+msgid "An incident has been resolved in %{project_path}."
+msgstr ""
+
+msgid "An incident has been triggered in %{project_path}."
+msgstr ""
+
 msgid "An integer value is required for seconds"
 msgstr ""
 
@@ -13930,6 +13936,9 @@ msgstr ""
 msgid "Escalation policies must have at least one rule"
 msgstr ""
 
+msgid "Escalation policy:"
+msgstr ""
+
 msgid "EscalationPolicies|%{clockIcon} IF alert is not %{alertStatus} in %{minutes}"
 msgstr ""
 
@@ -22246,6 +22255,9 @@ msgstr ""
 msgid "Metrics and profiling"
 msgstr ""
 
+msgid "Metrics:"
+msgstr ""
+
 msgid "MetricsDashboardAnnotation|Annotation can't belong to both a cluster and an environment at the same time"
 msgstr ""
 
@@ -38616,6 +38628,12 @@ msgstr ""
 msgid "View group labels"
 msgstr ""
 
+msgid "View incident details at"
+msgstr ""
+
+msgid "View incident details."
+msgstr ""
+
 msgid "View incident issues."
 msgstr ""