Skip to content

G
gitlab-ce
Commit efc6baf7 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files
Options

Merge branch 'fix-snippet-comments' into 'master' 

Fix snippet comments

Also fixes #1209

See merge request !936
parents 3decd462 75e903c0
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
app/finders/notes_finder.rb
View file @ efc6baf7
...@@ -14,7 +14,7 @@ class NotesFinder ...@@ -14,7 +14,7 @@ class NotesFinder
project.issues.find(target_id).notes.inc_author.fresh project.issues.find(target_id).notes.inc_author.fresh
when "merge_request" when "merge_request"
project.merge_requests.find(target_id).mr_and_commit_notes.inc_author.fresh project.merge_requests.find(target_id).mr_and_commit_notes.inc_author.fresh
when "snippet" when "snippet", "project_snippet"
project.snippets.find(target_id).notes.fresh project.snippets.find(target_id).notes.fresh
else else
raise 'invalid target_type' raise 'invalid target_type'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7