diff options
author | Douwe Maan <douwe@selenight.nl> | 2016-04-26 17:20:26 +0200 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2016-04-26 17:20:26 +0200 |
commit | d8e6386b64ee9657e6354bea5713f9da8ceb71df (patch) | |
tree | fb33ef8b3928b2096bb44c73d52b8eeda643411e | |
parent | 9c3df5cf5259f6308471273f680085a36da6bdd9 (diff) | |
download | gitlab-ce-d8e6386b64ee9657e6354bea5713f9da8ceb71df.tar.gz |
Revert "Merge branch '15579-filter-milestone-confidential-issues-api' into 'master'"
This reverts commit 550f9a740c472ac4075284f08a2074ecffd64920.
-rw-r--r-- | lib/api/milestones.rb | 10 | ||||
-rw-r--r-- | spec/requests/api/milestones_spec.rb | 31 |
2 files changed, 2 insertions, 39 deletions
diff --git a/lib/api/milestones.rb b/lib/api/milestones.rb index 81d7f440c20..c5cd73943fb 100644 --- a/lib/api/milestones.rb +++ b/lib/api/milestones.rb @@ -87,15 +87,7 @@ module API authorize! :read_milestone, user_project @milestone = user_project.milestones.find(params[:milestone_id]) - - finder_params = { - project_id: user_project.id, - milestone_title: @milestone.title, - state: 'all' - } - - issues = IssuesFinder.new(current_user, finder_params).execute - present paginate(issues), with: Entities::Issue, current_user: current_user + present paginate(@milestone.issues), with: Entities::Issue end end diff --git a/spec/requests/api/milestones_spec.rb b/spec/requests/api/milestones_spec.rb index 243c5e4cac2..db0f6e3c0f5 100644 --- a/spec/requests/api/milestones_spec.rb +++ b/spec/requests/api/milestones_spec.rb @@ -106,7 +106,7 @@ describe API::API, api: true do describe 'GET /projects/:id/milestones/:milestone_id/issues' do before do - milestone.issues << create(:issue, project: project) + milestone.issues << create(:issue) end it 'should return project issues for a particular milestone' do get api("/projects/#{project.id}/milestones/#{milestone.id}/issues", user) @@ -119,34 +119,5 @@ describe API::API, api: true do get api("/projects/#{project.id}/milestones/#{milestone.id}/issues") expect(response.status).to eq(401) end - - describe 'confidential issues' do - let(:public_project) { create(:project, :public) } - let(:milestone) { create(:milestone, project: public_project) } - let(:issue) { create(:issue, project: public_project) } - let(:confidential_issue) { create(:issue, confidential: true, project: public_project) } - before do - public_project.team << [user, :developer] - milestone.issues << issue << confidential_issue - end - - it 'returns confidential issues to team members' do - get api("/projects/#{public_project.id}/milestones/#{milestone.id}/issues", user) - - expect(response.status).to eq(200) - expect(json_response).to be_an Array - expect(json_response.size).to eq(2) - expect(json_response.map { |issue| issue['id'] }).to include(issue.id, confidential_issue.id) - end - - it 'does not return confidential issues to regular users' do - get api("/projects/#{public_project.id}/milestones/#{milestone.id}/issues", create(:user)) - - expect(response.status).to eq(200) - expect(json_response).to be_an Array - expect(json_response.size).to eq(1) - expect(json_response.map { |issue| issue['id'] }).to include(issue.id) - end - end end end |