summaryrefslogtreecommitdiff
path: root/app/serializers
diff options
context:
space:
mode:
authorZ.J. van de Weg <git@zjvandeweg.nl>2017-05-31 22:10:00 +0200
committerZ.J. van de Weg <git@zjvandeweg.nl>2017-06-01 09:58:12 +0200
commit5fdb51240f2093342b0ff0930b8d3798446e0026 (patch)
treec4019295712e03653b15a879b19886459f03319f /app/serializers
parent8a9a62e3294d92f4e70be6f427c17241a2b7a232 (diff)
downloadgitlab-ce-5fdb51240f2093342b0ff0930b8d3798446e0026.tar.gz
Rename build to job
Diffstat (limited to 'app/serializers')
-rw-r--r--app/serializers/build_artifact_entity.rb8
-rw-r--r--app/serializers/build_details_entity.rb2
2 files changed, 5 insertions, 5 deletions
diff --git a/app/serializers/build_artifact_entity.rb b/app/serializers/build_artifact_entity.rb
index 091bc8d6742..cb55c98f7c6 100644
--- a/app/serializers/build_artifact_entity.rb
+++ b/app/serializers/build_artifact_entity.rb
@@ -10,16 +10,16 @@ class BuildArtifactEntity < Grape::Entity
expose :path do |job|
download_namespace_project_job_artifacts_path(
- build.project.namespace,
- build.project,
- build)
+ project.namespace,
+ project,
+ job)
end
expose :keep_path, if: -> (*) { job.has_expiring_artifacts? } do |job|
keep_namespace_project_job_artifacts_path(
project.namespace,
project,
- build)
+ job)
end
expose :browse_path do |job|
diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb
index 2d76ce203b9..03c7f238eca 100644
--- a/app/serializers/build_details_entity.rb
+++ b/app/serializers/build_details_entity.rb
@@ -4,7 +4,7 @@ class BuildDetailsEntity < BuildEntity
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_build_path(project.namespace, project, build)
+ erase_namespace_project_job_path(project.namespace, project, build)
end
expose :artifacts, using: BuildArtifactEntity