Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-02-16 14:22:38 +0300
committerRémy Coutable <remy@rymai.me>2017-02-16 14:22:38 +0300
commit680d37b3f3868d11e7cd46b3e965febde5806964 (patch)
tree8a38b9b16c7794c1c9b650ae69357fe2dbb16152 /lib/api
parent4ee8cf43cdece9357fce4ed2c6f7c0203e11d2b3 (diff)
parent7a8d0aab61fa5d59a4bde5330948f1adcfbb542c (diff)
Merge branch '27873-when-a-commit-appears-in-several-projects-commit-comments-are-shared-across-projects' into 'master'
Ensure only commit comments relevant to target project are returned Closes #27873 See merge request !9264
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/commits.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/commits.rb b/lib/api/commits.rb
index 2fefe760d24..173083d0ade 100644
--- a/lib/api/commits.rb
+++ b/lib/api/commits.rb
@@ -114,7 +114,7 @@ module API
commit = user_project.commit(params[:sha])
not_found! 'Commit' unless commit
- notes = Note.where(commit_id: commit.id).order(:created_at)
+ notes = user_project.notes.where(commit_id: commit.id).order(:created_at)
present paginate(notes), with: Entities::CommitNote
end