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 /spec/mailers | |
parent | 990b7413bc68bab8aea2aac06c45e31264e26b22 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/mailers')
-rw-r--r-- | spec/mailers/emails/merge_requests_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/mailers/emails/merge_requests_spec.rb b/spec/mailers/emails/merge_requests_spec.rb index 412cdff3aba..34665d943ab 100644 --- a/spec/mailers/emails/merge_requests_spec.rb +++ b/spec/mailers/emails/merge_requests_spec.rb @@ -64,7 +64,7 @@ RSpec.describe Emails::MergeRequests do } end - it { expect(subject).to have_content('This attachment has been truncated to avoid exceeding the maximum allowed attachment size of 15MB.') } + it { expect(subject).to have_content('attachment has been truncated to avoid exceeding the maximum allowed attachment size of 15 MB.') } end end end |