Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 1 deletions

diff --git a/lib/gitlab/data_builder/deployment.rb b/lib/gitlab/data_builder/deployment.rb
index f11e032ab84..70587b3132a 100644
--- a/lib/gitlab/data_builder/deployment.rb
+++ b/lib/gitlab/data_builder/deployment.rb
@@ -6,11 +6,17 @@ module Gitlab
       extend self
 
       def build(deployment)
+        # Deployments will not have a deployable when created using the API.
+        deployable_url =
+          if deployment.deployable
+            Gitlab::UrlBuilder.build(deployment.deployable)
+          end
+
         {
           object_kind: 'deployment',
           status: deployment.status,
           deployable_id: deployment.deployable_id,
-          deployable_url: Gitlab::UrlBuilder.build(deployment.deployable),
+          deployable_url: deployable_url,
           environment: deployment.environment.name,
           project: deployment.project.hook_attrs,
           short_sha: deployment.short_sha,