Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

1 files changed, 6 insertions, 1 deletions

diff --git a/lib/gitlab/data_builder/pipeline.rb b/lib/gitlab/data_builder/pipeline.rb
index a75c7c539ae..939eaa377aa 100644
--- a/lib/gitlab/data_builder/pipeline.rb
+++ b/lib/gitlab/data_builder/pipeline.rb
@@ -105,6 +105,7 @@ module Gitlab
           target_project_id: merge_request.target_project_id,
           state: merge_request.state,
           merge_status: merge_request.public_merge_status,
+          detailed_merge_status: detailed_merge_status(merge_request),
           url: Gitlab::UrlBuilder.build(merge_request)
         }
       end
@@ -146,7 +147,7 @@ module Gitlab
       end
 
       def environment_hook_attrs(build)
-        return unless build.has_environment?
+        return unless build.has_environment_keyword?
 
         {
           name: build.expanded_environment_name,
@@ -154,6 +155,10 @@ module Gitlab
           deployment_tier: build.persisted_environment.try(:tier)
         }
       end
+
+      def detailed_merge_status(merge_request)
+        ::MergeRequests::Mergeability::DetailedMergeStatusService.new(merge_request: merge_request).execute.to_s
+      end
     end
   end
 end