diff options
author | Stan Hu <stanhu@gmail.com> | 2019-02-14 08:06:38 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-02-14 08:06:38 +0300 |
commit | 22f63b7b5471111517bdbd2ec3ced67134a37aaf (patch) | |
tree | ab694cec755c66ea49ea78f1059f42b6375f25ca | |
parent | c6016ac8a8c12a736617e5250b63e0c930dda207 (diff) |
Revert "Merge branch '50559-add-milestone-progress-to-api' into 'master'"
This reverts merge request !25173
-rw-r--r-- | changelogs/unreleased/50559-add-milestone-progress-to-api.yml | 5 | ||||
-rw-r--r-- | doc/api/group_milestones.md | 1 | ||||
-rw-r--r-- | doc/api/milestones.md | 1 | ||||
-rw-r--r-- | lib/api/entities.rb | 3 | ||||
-rw-r--r-- | lib/api/milestone_responses.rb | 8 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/milestone.json | 1 | ||||
-rw-r--r-- | spec/support/api/milestones_shared_examples.rb | 5 |
7 files changed, 4 insertions, 20 deletions
diff --git a/changelogs/unreleased/50559-add-milestone-progress-to-api.yml b/changelogs/unreleased/50559-add-milestone-progress-to-api.yml deleted file mode 100644 index e68e4bd6059..00000000000 --- a/changelogs/unreleased/50559-add-milestone-progress-to-api.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: 'API: Expose milestone progress' -merge_request: 25173 -author: Robert Schilling -type: added diff --git a/doc/api/group_milestones.md b/doc/api/group_milestones.md index 920acaf3e49..7be01ce9c6d 100644 --- a/doc/api/group_milestones.md +++ b/doc/api/group_milestones.md @@ -42,7 +42,6 @@ Example Response: "due_date": "2013-11-29", "start_date": "2013-11-10", "state": "active", - "percentage_complete" : 66, "updated_at": "2013-10-02T09:24:18Z", "created_at": "2013-10-02T09:24:18Z" } diff --git a/doc/api/milestones.md b/doc/api/milestones.md index 21a390442bd..fa8f8a0bcf0 100644 --- a/doc/api/milestones.md +++ b/doc/api/milestones.md @@ -39,7 +39,6 @@ Example Response: "due_date": "2013-11-29", "start_date": "2013-11-10", "state": "active", - "percentage_complete" : 66, "updated_at": "2013-10-02T09:24:18Z", "created_at": "2013-10-02T09:24:18Z" } diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 0ef56067b95..173e86dfd3b 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -502,9 +502,6 @@ module API expose :state, :created_at, :updated_at expose :due_date expose :start_date - expose :percentage_complete do |milestone, options| - milestone.percent_complete(options[:current_user]) - end expose :web_url do |milestone, _options| Gitlab::UrlBuilder.build(milestone) diff --git a/lib/api/milestone_responses.rb b/lib/api/milestone_responses.rb index 4c68c568aaa..a0ca39b69d4 100644 --- a/lib/api/milestone_responses.rb +++ b/lib/api/milestone_responses.rb @@ -35,19 +35,19 @@ module API milestones = filter_by_iid(milestones, params[:iids]) if params[:iids].present? milestones = filter_by_search(milestones, params[:search]) if params[:search] - present paginate(milestones), with: Entities::Milestone, current_user: current_user + present paginate(milestones), with: Entities::Milestone end def get_milestone_for(parent) milestone = parent.milestones.find(params[:milestone_id]) - present milestone, with: Entities::Milestone, current_user: current_user + present milestone, with: Entities::Milestone end def create_milestone_for(parent) milestone = ::Milestones::CreateService.new(parent, current_user, declared_params).execute if milestone.valid? - present milestone, with: Entities::Milestone, current_user: current_user + present milestone, with: Entities::Milestone else render_api_error!("Failed to create milestone #{milestone.errors.messages}", 400) end @@ -60,7 +60,7 @@ module API milestone = ::Milestones::UpdateService.new(parent, current_user, milestone_params).execute(milestone) if milestone.valid? - present milestone, with: Entities::Milestone, current_user: current_user + present milestone, with: Entities::Milestone else render_api_error!("Failed to update milestone #{milestone.errors.messages}", 400) end diff --git a/spec/fixtures/api/schemas/public_api/v4/milestone.json b/spec/fixtures/api/schemas/public_api/v4/milestone.json index 971f7980f46..6ca2e88ae91 100644 --- a/spec/fixtures/api/schemas/public_api/v4/milestone.json +++ b/spec/fixtures/api/schemas/public_api/v4/milestone.json @@ -8,7 +8,6 @@ "title": { "type": "string" }, "description": { "type": ["string", "null"] }, "state": { "type": "string" }, - "percentage_complete": { "type": "integer" }, "created_at": { "type": "date" }, "updated_at": { "type": "date" }, "start_date": { "type": "date" }, diff --git a/spec/support/api/milestones_shared_examples.rb b/spec/support/api/milestones_shared_examples.rb index b426fadb001..5f709831ce1 100644 --- a/spec/support/api/milestones_shared_examples.rb +++ b/spec/support/api/milestones_shared_examples.rb @@ -8,17 +8,12 @@ shared_examples_for 'group and project milestones' do |route_definition| describe "GET #{route_definition}" do it 'returns milestones list' do - create(:issue, project: project, milestone: milestone) - create(:closed_issue, project: project, milestone: milestone) - create(:closed_issue, project: project, milestone: milestone) - get api(route, user) expect(response).to have_gitlab_http_status(200) expect(response).to include_pagination_headers expect(json_response).to be_an Array expect(json_response.first['title']).to eq(milestone.title) - expect(json_response.first['percentage_complete']).to eq(66) end it 'returns a 401 error if user not authenticated' do |