summaryrefslogtreecommitdiff
path: root/app/models/note.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-04-20 12:42:31 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-04-20 12:42:31 +0000
commita4006a6b4840c990adf5293d7c611b2fa798a5bf (patch)
tree4c4df25558f8b35880adb2cf538e92d594d154e0 /app/models/note.rb
parentd9f7499046f25dcbe69c50cb819315e69c0bf213 (diff)
parent630e879066156e8593a8b42b531ef727227c60bf (diff)
downloadgitlab-ce-a4006a6b4840c990adf5293d7c611b2fa798a5bf.tar.gz
Merge branch 'better-commit-mentions' into 'master'
Clean up code around commit mentions. Builds upon !527. See merge request !528
Diffstat (limited to 'app/models/note.rb')
-rw-r--r--app/models/note.rb8
1 files changed, 0 insertions, 8 deletions
diff --git a/app/models/note.rb b/app/models/note.rb
index 2cf3fac2def..4b5fa7a2ab5 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -327,14 +327,6 @@ class Note < ActiveRecord::Base
current_application_settings.max_attachment_size.megabytes.to_i
end
- def commit_author
- @commit_author ||=
- project.team.users.find_by(email: noteable.author_email) ||
- project.team.users.find_by(name: noteable.author_name)
- rescue
- nil
- end
-
def cross_reference?
note.start_with?(self.class.cross_reference_note_prefix)
end