summaryrefslogtreecommitdiff
path: root/spec/mailers
diff options
context:
space:
mode:
authorCindy Pallares <cindy@gitlab.com>2018-11-28 19:04:15 +0000
committerCindy Pallares <cindy@gitlab.com>2018-11-28 19:11:56 -0500
commite122e14ac6a25c7813ca888a97bd4a3298e78d9d (patch)
treebd3774fae0517a63dd1e30b3fc95c00c54878357 /spec/mailers
parentffd1c4cd453043448198d4a1c9582f5c54f5c377 (diff)
downloadgitlab-ce-e122e14ac6a25c7813ca888a97bd4a3298e78d9d.tar.gz
Merge branch 'security-guest-comments' into 'master'
[master]Fixed ability to comment on and edit/delete comments on locked or confidential issues See merge request gitlab/gitlabhq!2612
Diffstat (limited to 'spec/mailers')
-rw-r--r--spec/mailers/notify_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index ff1a5aa2536..150c00e4bfe 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -522,7 +522,7 @@ describe Notify do
let(:project_snippet) { create(:project_snippet, project: project) }
let(:project_snippet_note) { create(:note_on_project_snippet, project: project, noteable: project_snippet) }
- subject { described_class.note_snippet_email(project_snippet_note.author_id, project_snippet_note.id) }
+ subject { described_class.note_project_snippet_email(project_snippet_note.author_id, project_snippet_note.id) }
it_behaves_like 'an answer to an existing thread with reply-by-email enabled' do
let(:model) { project_snippet }