diff options
author | Kamil TrzciĆski <ayufan@ayufan.eu> | 2017-06-13 13:13:30 +0000 |
---|---|---|
committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-06-15 11:00:43 -0500 |
commit | 279f4a1c5ce86efc1bcba3f5085d4ca0a9067228 (patch) | |
tree | 6d01bc80f5b2777a28712da933ce87b45fe89057 | |
parent | 220ef24fa716a36858a798e5f706cc9c1a3d9751 (diff) | |
download | gitlab-ce-279f4a1c5ce86efc1bcba3f5085d4ca0a9067228.tar.gz |
Merge branch 'fix/gb/remove-invalid-build-details-exposure' into 'master'
Do not expose internal artifacts hash in build entity
Closes #33605
See merge request !12124
-rw-r--r-- | app/serializers/build_details_entity.rb | 7 | ||||
-rw-r--r-- | spec/serializers/build_details_entity_spec.rb | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb index 0063920e603..3c25b497e2e 100644 --- a/app/serializers/build_details_entity.rb +++ b/app/serializers/build_details_entity.rb @@ -1,18 +1,15 @@ class BuildDetailsEntity < BuildEntity expose :coverage, :erased_at, :duration expose :tag_list, as: :tags - expose :user, using: UserEntity + expose :runner, using: RunnerEntity + expose :pipeline, using: PipelineEntity expose :erased_by, if: -> (*) { build.erased? }, using: UserEntity expose :erase_path, if: -> (*) { build.erasable? && can?(current_user, :update_build, project) } do |build| erase_namespace_project_job_path(project.namespace, project, build) end - expose :artifacts, using: BuildArtifactEntity - expose :runner, using: RunnerEntity - expose :pipeline, using: PipelineEntity - expose :merge_request, if: -> (*) { can?(current_user, :read_merge_request, build.merge_request) } do expose :iid do |build| build.merge_request.iid diff --git a/spec/serializers/build_details_entity_spec.rb b/spec/serializers/build_details_entity_spec.rb index e2511e8968c..396ba96e9b3 100644 --- a/spec/serializers/build_details_entity_spec.rb +++ b/spec/serializers/build_details_entity_spec.rb @@ -29,7 +29,7 @@ describe BuildDetailsEntity do it 'contains the needed key value pairs' do expect(subject).to include(:coverage, :erased_at, :duration) - expect(subject).to include(:artifacts, :runner, :pipeline) + expect(subject).to include(:runner, :pipeline) expect(subject).to include(:raw_path, :merge_request) expect(subject).to include(:new_issue_path) end |