Skip to content

Commit 37ae177

Browse files
author
GitLab Bot
committed
Add latest changes from gitlab-org/gitlab@master
1 parent 6918db8 commit 37ae177

File tree

10 files changed

+801
-825
lines changed

10 files changed

+801
-825
lines changed

.rubocop_todo/style/super_arguments.yml

-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ Style/SuperArguments:
109109
- 'ee/lib/audit_events/strategies/base_google_cloud_logging_destination_strategy.rb'
110110
- 'ee/lib/banzai/filter/references/iteration_reference_filter.rb'
111111
- 'ee/lib/ee/api/groups.rb'
112-
- 'ee/lib/ee/api/internal/kubernetes.rb'
113112
- 'ee/lib/ee/api/snippets.rb'
114113
- 'ee/lib/ee/banzai/filter/sanitization_filter.rb'
115114
- 'ee/lib/ee/gitlab/quick_actions/users_extractor.rb'

GITALY_SERVER_VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
98e4597b4ab1d5a87be725ae0aa58ba3f2566210
1+
6b099fa48bb2b7b64af5d10e2d361d0ceb0b3dad

app/models/issue.rb

+7-4
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,13 @@ def most_recent
163163

164164
scope :not_authored_by, ->(user) { where.not(author_id: user) }
165165

166+
# N.B. The start_date and due_date columns are preserved on the issues table to enable performant sorting by these
167+
# dates, since we would otherwise need to perform a join for the sort. These are synced via the DB trigger
168+
# sync_issues_dates_with_work_item_dates_sources() from the work_item_dates_sources table
166169
scope :order_due_date_asc, -> { reorder(arel_table[:due_date].asc.nulls_last) }
167170
scope :order_due_date_desc, -> { reorder(arel_table[:due_date].desc.nulls_last) }
171+
scope :order_start_date_asc, -> { reorder(arel_table[:start_date].asc.nulls_last) }
172+
scope :order_start_date_desc, -> { reorder(arel_table[:start_date].desc.nulls_last) }
168173
scope :order_closest_future_date, -> { reorder(Arel.sql("CASE WHEN issues.due_date >= CURRENT_DATE THEN 0 ELSE 1 END ASC, ABS(CURRENT_DATE - issues.due_date) ASC")) }
169174
scope :order_created_at_desc, -> { reorder(created_at: :desc) }
170175
scope :order_severity_asc, -> do
@@ -189,8 +194,6 @@ def most_recent
189194
scope :order_escalation_status_desc, -> { includes(:incident_management_issuable_escalation_status).order(IncidentManagement::IssuableEscalationStatus.arel_table[:status].desc.nulls_last).references(:incident_management_issuable_escalation_status) }
190195
scope :order_closed_at_asc, -> { reorder(arel_table[:closed_at].asc.nulls_last) }
191196
scope :order_closed_at_desc, -> { reorder(arel_table[:closed_at].desc.nulls_last) }
192-
scope :order_start_date_asc, -> { left_joins(:dates_source).order(WorkItems::DatesSource.arel_table[:start_date].asc.nulls_last) }
193-
scope :order_start_date_desc, -> { left_joins(:dates_source).order(WorkItems::DatesSource.arel_table[:start_date].desc.nulls_last) }
194197

195198
scope :preload_associated_models, -> { preload(:assignees, :labels, project: :namespace) }
196199
scope :with_web_entity_associations, -> do
@@ -449,15 +452,15 @@ def self.sort_by_attribute(method, excluded_labels: [])
449452
when 'closest_future_date', 'closest_future_date_asc' then order_closest_future_date
450453
when 'due_date', 'due_date_asc' then order_due_date_asc.with_order_id_desc
451454
when 'due_date_desc' then order_due_date_desc.with_order_id_desc
455+
when 'start_date', 'start_date_asc' then order_start_date_asc.with_order_id_desc
456+
when 'start_date_desc' then order_start_date_desc.with_order_id_desc
452457
when 'relative_position', 'relative_position_asc' then order_by_relative_position
453458
when 'severity_asc' then order_severity_asc
454459
when 'severity_desc' then order_severity_desc
455460
when 'escalation_status_asc' then order_escalation_status_asc
456461
when 'escalation_status_desc' then order_escalation_status_desc
457462
when 'closed_at', 'closed_at_asc' then order_closed_at_asc
458463
when 'closed_at_desc' then order_closed_at_desc
459-
when 'start_date', 'start_date_asc' then order_start_date_asc
460-
when 'start_date_desc' then order_start_date_desc
461464
else
462465
super
463466
end

doc/user/application_security/dependency_scanning/_index.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ table.no-vertical-table-lines tr {
5151

5252
{{< alert type="warning" >}}
5353

54-
The Dependency Scanning feature based on the Gemnasium analyzer is deprecated in GitLab 17.9 and reaches
55-
end of support in GitLab 18.0. It is replaced with [Dependency Scanning using SBOM](dependency_scanning_sbom/_index.md)
54+
The Dependency Scanning feature based on the Gemnasium analyzer is deprecated in GitLab 17.9 and is planned for removal in
55+
GitLab 19.0. It is being replaced with [Dependency Scanning using SBOM](dependency_scanning_sbom/_index.md)
5656
and the [new Dependency Scanning analyzer](https://gitlab.com/gitlab-org/security-products/analyzers/dependency-scanning).
57-
For more information, see [issue 501038](https://gitlab.com/gitlab-org/gitlab/-/issues/501308).
57+
For more information, see [epic 15961](https://gitlab.com/groups/gitlab-org/-/epics/15961).
5858

5959
{{< /alert >}}
6060

lib/gitlab/ci/status/build/common.rb

-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ def has_details?
1818
end
1919

2020
def details_path
21-
return unless can?(user, :read_build, subject)
22-
2321
project_job_path(subject.project, subject)
2422
end
2523
end

0 commit comments

Comments
 (0)