diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-11 12:10:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-11 12:10:46 +0300 |
| commit | c2dcc63e6db8e9ee3365c45356451d8144eb0c23 (patch) | |
| tree | ebca0b4d04f037de3c8a2722990fbcf7e123eb30 /app/mailers | |
| parent | 990b7413bc68bab8aea2aac06c45e31264e26b22 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/emails/issues.rb | 2 | ||||
| -rw-r--r-- | app/mailers/emails/merge_requests.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/app/mailers/emails/issues.rb b/app/mailers/emails/issues.rb index b2c1351bd28..c565df1a2ee 100644 --- a/app/mailers/emails/issues.rb +++ b/app/mailers/emails/issues.rb @@ -106,6 +106,8 @@ module Emails @count = export_status.fetch(:rows_expected) @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) 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 28ac752f550..4faa1a11276 100644 --- a/app/mailers/emails/merge_requests.rb +++ b/app/mailers/emails/merge_requests.rb @@ -115,6 +115,8 @@ module Emails @count = export_status.fetch(:rows_expected) @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) filename = "#{project.full_path.parameterize}_merge_requests_#{Date.current.iso8601}.csv" attachments[filename] = { content: csv_data, mime_type: 'text/csv' } |