diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-06 21:08:19 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-06 21:08:19 +0300 |
commit | da6cd333e7d29b356b398905c657be81a94b4621 (patch) | |
tree | 9455ef6355f90b710383d93aefa6b990117855b2 /spec/initializers/mail_encoding_patch_spec.rb | |
parent | 5472bef68de87deeb67594a98e7eb35ff83929ec (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/initializers/mail_encoding_patch_spec.rb')
-rw-r--r-- | spec/initializers/mail_encoding_patch_spec.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/initializers/mail_encoding_patch_spec.rb b/spec/initializers/mail_encoding_patch_spec.rb index e19a8737459..12539c9ca52 100644 --- a/spec/initializers/mail_encoding_patch_spec.rb +++ b/spec/initializers/mail_encoding_patch_spec.rb @@ -1,8 +1,7 @@ # frozen_string_literal: true -# rubocop:disable RSpec/VariableDefinition +# rubocop:disable RSpec/VariableDefinition, RSpec/VariableName require 'fast_spec_helper' - require 'mail' require_relative '../../config/initializers/mail_encoding_patch' @@ -206,4 +205,4 @@ RSpec.describe 'Mail quoted-printable transfer encoding patch and Unicode charac end end end -# rubocop:enable RSpec/VariableDefinition +# rubocop:enable RSpec/VariableDefinition, RSpec/VariableName |