summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-05-31 19:35:13 +0000
committerRobert Speicher <robert@gitlab.com>2016-05-31 19:35:13 +0000
commit613bcdc6262f30156bc240e532c781f1d0681b9f (patch)
tree31c70a4a39abb01eefa0f088fd88937e5647e876 /lib
parentef4fedc18f5e2475aa36cc4327a76a496567c6fc (diff)
parent9154586ce5c46dfac83a1ed1e4beac1940913f16 (diff)
downloadgitlab-ce-613bcdc6262f30156bc240e532c781f1d0681b9f.tar.gz
Merge branch 'data_leak' into 'master'
Confidential notes data leak Fixes part of https://gitlab.com/gitlab-org/gitlab-ee/issues/575 See merge request !1967
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/project_search_results.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/project_search_results.rb b/lib/gitlab/project_search_results.rb
index 71c5b6801fb..183bd10d6a3 100644
--- a/lib/gitlab/project_search_results.rb
+++ b/lib/gitlab/project_search_results.rb
@@ -74,7 +74,7 @@ module Gitlab
end
def notes
- project.notes.user.search(query).order('updated_at DESC')
+ project.notes.user.search(query, as_user: @current_user).order('updated_at DESC')
end
def commits