1 files changed, 6 insertions, 2 deletions
diff --git a/lib/gitlab/data_builder/build.rb b/lib/gitlab/data_builder/build.rb
index 4640f85bb0a..8eda871770b 100644
--- a/lib/gitlab/data_builder/build.rb
+++ b/lib/gitlab/data_builder/build.rb
@@ -12,7 +12,7 @@ module Gitlab
 
         author_url = build_author_url(build.commit, commit)
 
-        {
+        data = {
           object_kind: 'build',
 
           ref: build.ref,
@@ -68,6 +68,10 @@ module Gitlab
 
           environment: build_environment(build)
         }
+
+        data[:retries_count] = build.retries_count if Feature.enabled?(:job_webhook_retries_count, project)
+
+        data
       end
 
       private
@@ -91,7 +95,7 @@ module Gitlab
       end
 
       def build_environment(build)
-        return unless build.has_environment?
+        return unless build.has_environment_keyword?
 
         {
           name: build.expanded_environment_name,