Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-06-06 06:07:26 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-06-06 06:07:26 +0300
commit5e448ff06309854c838fb5eaa46fd05ebc5218ab (patch)
tree0fd59db933c6f11053028559a8f6fc2e2b050f6e /spec/mailers
parentbdad4dd5dabec7a0a611d5241fa2d56359884420 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/mailers')
-rw-r--r--spec/mailers/emails/merge_requests_spec.rb2
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 9aece9538dc..9a8d1e1279b 100644
--- a/spec/mailers/emails/merge_requests_spec.rb
+++ b/spec/mailers/emails/merge_requests_spec.rb
@@ -253,7 +253,7 @@ RSpec.describe Emails::MergeRequests do
}
end
- it { expect(subject).to have_content('attachment has been truncated to avoid exceeding the maximum allowed attachment size of 15 MB.') }
+ it { expect(subject).to have_content('attachment has been truncated to avoid exceeding the maximum allowed attachment size of 15 MiB.') }
end
end