summaryrefslogtreecommitdiff
path: root/app/mailers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-01-30 12:07:29 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-01-30 12:07:29 +0000
commit7cf8c080eda823e7e2577eeed1f96e168c37ee8f (patch)
tree25777ab1b8883dd4cff80005a2edc5e385e16714 /app/mailers
parent4381702a8509383c7158a4d89a0ed187532604f2 (diff)
downloadgitlab-ce-7cf8c080eda823e7e2577eeed1f96e168c37ee8f.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/emails/issues.rb2
-rw-r--r--app/mailers/emails/merge_requests.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/mailers/emails/issues.rb b/app/mailers/emails/issues.rb
index 6a5680c080b..58843435fa0 100644
--- a/app/mailers/emails/issues.rb
+++ b/app/mailers/emails/issues.rb
@@ -105,7 +105,7 @@ module Emails
@written_count = export_status.fetch(:rows_written)
@truncated = export_status.fetch(:truncated)
@size_limit = ActiveSupport::NumberHelper
- .number_to_human_size(Issuable::ExportCsv::BaseService::TARGET_FILESIZE)
+ .number_to_human_size(ExportCsv::BaseService::TARGET_FILESIZE)
filename = "#{project.full_path.parameterize}_issues_#{Date.today.iso8601}.csv"
attachments[filename] = { content: csv_data, mime_type: 'text/csv' }
diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb
index fc944c34166..6678bb563ed 100644
--- a/app/mailers/emails/merge_requests.rb
+++ b/app/mailers/emails/merge_requests.rb
@@ -138,7 +138,7 @@ module Emails
@written_count = export_status.fetch(:rows_written)
@truncated = export_status.fetch(:truncated)
@size_limit = ActiveSupport::NumberHelper
- .number_to_human_size(Issuable::ExportCsv::BaseService::TARGET_FILESIZE)
+ .number_to_human_size(ExportCsv::BaseService::TARGET_FILESIZE)
filename = "#{project.full_path.parameterize}_merge_requests_#{Date.current.iso8601}.csv"
attachments[filename] = { content: csv_data, mime_type: 'text/csv' }