summaryrefslogtreecommitdiff
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-11-23 14:04:42 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-11-23 14:04:42 +0000
commit038f5a412d0085f2d9610c77cea37cec75572b27 (patch)
tree5a3ba500992d5c9409cf52fa8c15e9d9a9b39549 /app/models/user.rb
parentb8db9c8c8c406d4abc03ba7246bbfecbecfbc784 (diff)
parente826c5d0917a7fe2225fb6ba0862bc56c1ef3fc2 (diff)
downloadgitlab-ce-038f5a412d0085f2d9610c77cea37cec75572b27.tar.gz
Merge branch 'jk-group-mentions-fix' into 'master'
Fix link text from group context Closes gitlab-ee#4100 See merge request gitlab-org/gitlab-ce!15565
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 6c773b3ce7d..cf6b36559a8 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -437,7 +437,7 @@ class User < ActiveRecord::Base
username
end
- def to_reference(_from_project = nil, target_project: nil, full: nil)
+ def to_reference(_from = nil, target_project: nil, full: nil)
"#{self.class.reference_prefix}#{username}"
end