diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-23 09:14:52 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-23 09:14:52 +0000 |
commit | 347bf09d6ecf4871da234c06ca8ee541e27b5105 (patch) | |
tree | 2ad6943e0c681c22acc8850d1debc6a983b0e006 /app/services/issues | |
parent | 0a51be0866d33273070f535257626a9eb2e10700 (diff) | |
download | gitlab-ce-347bf09d6ecf4871da234c06ca8ee541e27b5105.tar.gz |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc20210223090520
Diffstat (limited to 'app/services/issues')
-rw-r--r-- | app/services/issues/export_csv_service.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/app/services/issues/export_csv_service.rb b/app/services/issues/export_csv_service.rb index 2181c46c90d..dd43c77adfa 100644 --- a/app/services/issues/export_csv_service.rb +++ b/app/services/issues/export_csv_service.rb @@ -5,6 +5,12 @@ module Issues include Gitlab::Routing.url_helpers include GitlabRoutingHelper + def initialize(issuables_relation, project) + super + + @labels = @issuables.labels_hash.transform_values { |labels| labels.sort.join(',').presence } + end + def email(user) Notify.issues_csv_email(user, project, csv_data, csv_builder.status).deliver_now end @@ -12,7 +18,7 @@ module Issues private def associations_to_preload - %i(author assignees timelogs milestone) + %i(author assignees timelogs milestone project) end def header_to_value_hash @@ -41,7 +47,7 @@ module Issues end def issue_labels(issue) - issuables.labels_hash[issue.id].sort.join(',').presence + @labels[issue.id] end # rubocop: disable CodeReuse/ActiveRecord |