diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-11-21 14:00:06 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-11-21 14:00:06 +0000 |
| commit | 2f3374be4cc53167a862cde7b9fd202d213f7f7a (patch) | |
| tree | e9e3cf46d1027122215b3fb79fb0620d345b3af9 | |
| parent | 5d5da05239f668349d8b98d64b0baac1c4a3e3dc (diff) | |
| parent | c742d3ba98c7454060068b543cfc1fca926d9be5 (diff) | |
| download | gitlab-ce-2f3374be4cc53167a862cde7b9fd202d213f7f7a.tar.gz | |
Merge branch 'optimise-job-request' into 'master'
Use cached size when passing artifacts to Runner
See merge request gitlab-org/gitlab-ce!23228
| -rw-r--r-- | changelogs/unreleased/optimise-job-request.yml | 5 | ||||
| -rw-r--r-- | lib/api/entities.rb | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changelogs/unreleased/optimise-job-request.yml b/changelogs/unreleased/optimise-job-request.yml new file mode 100644 index 00000000000..e1265841b48 --- /dev/null +++ b/changelogs/unreleased/optimise-job-request.yml @@ -0,0 +1,5 @@ +--- +title: Use cached size when passing artifacts to Runner +merge_request: +author: +type: performance diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 5572e86985c..cff05643f3b 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -1142,7 +1142,8 @@ module API end class JobArtifactFile < Grape::Entity - expose :filename, :size + expose :filename + expose :cached_size, as: :size end class JobArtifact < Grape::Entity |