diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-28 00:08:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-28 00:08:47 +0300 |
| commit | e4ea43b2b85ad5f3115f00220601eb719705139a (patch) | |
| tree | 1888a43f802e45ebb8dfed59595a790807777c6f /spec/lib/marginalia_spec.rb | |
| parent | 390582e118752426acf5cb25ec99103d312d891c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/marginalia_spec.rb')
| -rw-r--r-- | spec/lib/marginalia_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/marginalia_spec.rb b/spec/lib/marginalia_spec.rb index 5dc54af99ce..db428bb65c4 100644 --- a/spec/lib/marginalia_spec.rb +++ b/spec/lib/marginalia_spec.rb @@ -18,7 +18,7 @@ describe 'Marginalia spec' do end end - class MarginaliaTestMailer < BaseMailer + class MarginaliaTestMailer < ApplicationMailer def first_user User.first end |