From 509ed9c6be7846bd69b5820d56328220c8e91bc9 Mon Sep 17 00:00:00 2001 From: Thomas Randolph Date: Wed, 4 Dec 2024 18:23:55 -0700 Subject: [PATCH 1/2] Enable scoped labels for the Vue MR list --- ee/app/helpers/ee/merge_requests_helper.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ee/app/helpers/ee/merge_requests_helper.rb b/ee/app/helpers/ee/merge_requests_helper.rb index 6f79fd2691a67f..a886b44fc99eb6 100644 --- a/ee/app/helpers/ee/merge_requests_helper.rb +++ b/ee/app/helpers/ee/merge_requests_helper.rb @@ -66,7 +66,8 @@ def sticky_header_data(project, merge_request) override :project_merge_requests_list_data def project_merge_requests_list_data(project, current_user) super.merge({ - merge_trains_path: merge_trains_available?(project) && can?(current_user, :read_merge_train, project) ? project_merge_trains_path(project) : nil + merge_trains_path: merge_trains_available?(project) && can?(current_user, :read_merge_train, project) ? project_merge_trains_path(project) : nil, + has_scoped_labels_feature: project.feature_available?(:scoped_labels).to_s }) end -- GitLab From 763aab82ed9bd134cbf581630d018da92bd4fd4c Mon Sep 17 00:00:00 2001 From: Thomas Randolph Date: Wed, 4 Dec 2024 19:25:22 -0700 Subject: [PATCH 2/2] Use special "licensed_feature_available" function --- ee/app/helpers/ee/merge_requests_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/app/helpers/ee/merge_requests_helper.rb b/ee/app/helpers/ee/merge_requests_helper.rb index a886b44fc99eb6..7e96d0d6fe9fd9 100644 --- a/ee/app/helpers/ee/merge_requests_helper.rb +++ b/ee/app/helpers/ee/merge_requests_helper.rb @@ -67,7 +67,7 @@ def sticky_header_data(project, merge_request) def project_merge_requests_list_data(project, current_user) super.merge({ merge_trains_path: merge_trains_available?(project) && can?(current_user, :read_merge_train, project) ? project_merge_trains_path(project) : nil, - has_scoped_labels_feature: project.feature_available?(:scoped_labels).to_s + has_scoped_labels_feature: project.licensed_feature_available?(:scoped_labels).to_s }) end -- GitLab