summaryrefslogtreecommitdiff
path: root/lib/api/issues.rb
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-03-19 14:43:52 +0200
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-03-19 14:43:52 +0200
commitc8265f13ca0ad7d1bd04a699b61b3aa2f3d1e4e7 (patch)
treea646a24601d8164946c249fbc9cf8482d4b5dabf /lib/api/issues.rb
parent01b70c6c297c8be013b59c68a0c6b93318dcd021 (diff)
parent4f0302f00ef0c51b67b73429ace0a632971b7f1b (diff)
downloadgitlab-ce-c8265f13ca0ad7d1bd04a699b61b3aa2f3d1e4e7.tar.gz
Merge branch 'master' into gitlab_intro_docs
Diffstat (limited to 'lib/api/issues.rb')
-rw-r--r--lib/api/issues.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index 252744515da..fda6f841438 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -82,7 +82,7 @@ module API
# GET /projects/:id/issues?milestone=1.0.0&state=closed
# GET /issues?iid=42
get ":id/issues" do
- issues = user_project.issues
+ issues = user_project.issues.visible_to_user(current_user)
issues = filter_issues_state(issues, params[:state]) unless params[:state].nil?
issues = filter_issues_labels(issues, params[:labels]) unless params[:labels].nil?
issues = filter_by_iid(issues, params[:iid]) unless params[:iid].nil?
@@ -104,6 +104,7 @@ module API
# GET /projects/:id/issues/:issue_id
get ":id/issues/:issue_id" do
@issue = user_project.issues.find(params[:issue_id])
+ not_found! unless can?(current_user, :read_issue, @issue)
present @issue, with: Entities::Issue
end