diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-06-13 13:13:30 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-06-13 13:13:30 +0000 |
commit | 9cc126ea3fef95c71f1de98848b757aeae337193 (patch) | |
tree | f9341dc0db61d4ed32c123d301823f9313d468ff /app | |
parent | 0d499ce215b8ce4623349c4b00311c810f83c77c (diff) | |
parent | b3a1961a43de0f033bb33a8fbcb96c07b3dd598d (diff) | |
download | gitlab-ce-9cc126ea3fef95c71f1de98848b757aeae337193.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
Diffstat (limited to 'app')
-rw-r--r-- | app/serializers/build_details_entity.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb index 514c4c2e35f..0eddbaaaebf 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 |