summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2015-12-27 21:09:16 +0000
committerRobert Speicher <robert@gitlab.com>2015-12-27 21:09:16 +0000
commita97a2d27205637ea2ff6da112dabc1499c37ccfe (patch)
treeb49b508683a5cc184e4fd010072baff4e0a82515 /spec/models
parenta52746649d1db4f52ae4e989dcf654ef4af57905 (diff)
parent9a0e16f4548bca25f6efc6cd7a4dd0af42b60042 (diff)
downloadgitlab-ce-a97a2d27205637ea2ff6da112dabc1499c37ccfe.tar.gz
Merge branch 'mention-all' into 'master'
Only allow group/project members to mention `@all` Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3473 See merge request !2205
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/concerns/mentionable_spec.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/models/concerns/mentionable_spec.rb b/spec/models/concerns/mentionable_spec.rb
index 6653621a83e..20f0c561e44 100644
--- a/spec/models/concerns/mentionable_spec.rb
+++ b/spec/models/concerns/mentionable_spec.rb
@@ -3,6 +3,10 @@ require 'spec_helper'
describe Mentionable do
include Mentionable
+ def author
+ nil
+ end
+
describe :references do
let(:project) { create(:project) }