summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2019-06-08 18:13:31 +0200
committerMatija Čupić <matteeyah@gmail.com>2019-06-12 18:10:44 +0200
commit9384eeeb6d4d7fd04179a46dce75faef69cef3a0 (patch)
tree8822d335521a4a0ba884d1883769379e484afaa2
parent52b2b32517b3782cd009dc2a209c0eb274ddf3ce (diff)
downloadgitlab-ce-9384eeeb6d4d7fd04179a46dce75faef69cef3a0.tar.gz
Gate MR head_pipeline behind read_pipeline ability
-rw-r--r--lib/api/entities.rb4
-rw-r--r--spec/requests/api/merge_requests_spec.rb25
2 files changed, 28 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index b1b6e7bd7b9..79fb2d55d1c 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -751,7 +751,9 @@ module API
merge_request.metrics&.pipeline
end
- expose :head_pipeline, using: 'API::Entities::Pipeline'
+ expose :head_pipeline, using: 'API::Entities::Pipeline', if: -> (_, options) do
+ Ability.allowed?(options[:current_user], :read_pipeline, options[:project])
+ end
expose :diff_refs, using: Entities::DiffRefs
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 4cb4fcc890d..c54861a6b63 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -834,6 +834,31 @@ describe API::MergeRequests do
end
end
+ context 'head_pipeline' do
+ before do
+ merge_request.update(head_pipeline: create(:ci_pipeline))
+ merge_request.project.project_feature.update(builds_access_level: 10)
+ end
+
+ context 'when user can read the pipeline' do
+ it 'exposes pipeline information' do
+ get api("/projects/#{project.id}/merge_requests/#{merge_request.iid}", user)
+
+ expect(json_response).to include('head_pipeline')
+ end
+ end
+
+ context 'when user can not read the pipeline' do
+ let(:guest) { create(:user) }
+
+ it 'does not expose pipeline information' do
+ get api("/projects/#{project.id}/merge_requests/#{merge_request.iid}", guest)
+
+ expect(json_response).not_to include('head_pipeline')
+ end
+ end
+ end
+
it 'returns the commits behind the target branch when include_diverged_commits_count is present' do
allow_any_instance_of(merge_request.class).to receive(:diverged_commits_count).and_return(1)