Merge branch 'use-deployment-status-in-job-log-page' into expose-deployment-status-for-mr-widget

2 files changed, 0 insertions, 46 deletions

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index c5e6e0d46d2..94c1205a22e 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -700,23 +700,6 @@ module Ci
       end
     end
 
-    # Virtual deployment status depending on the environment status.
-    # def deployment_status
-    #   last_deployment.detailed_status
-    # end
-
-    # def deployment_status
-    #   return nil unless starts_environment?
-
-    #   if success?
-    #     return successful_deployment_status
-    #   elsif complete? && !success?
-    #     return :failed
-    #   end
-
-    #   :creating
-    # end
-
     private
 
     def erase_old_artifacts!
@@ -726,16 +709,6 @@ module Ci
       save
     end
 
-    def successful_deployment_status
-      if success? && last_deployment&.last?
-        return :last
-      elsif success? && last_deployment.present?
-        return :out_of_date
-      end
-
-      :creating
-    end
-
     def each_report(report_types)
       job_artifacts_for_types(report_types).each do |report_artifact|
         report_artifact.each_blob do |blob|
diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb
index bbcfa5ab346..ff910e8625c 100644
--- a/app/serializers/build_details_entity.rb
+++ b/app/serializers/build_details_entity.rb
@@ -8,27 +8,8 @@ class BuildDetailsEntity < JobEntity
   expose :user, using: UserEntity
   expose :runner, using: RunnerEntity
   expose :pipeline, using: PipelineEntity
-
-<<<<<<< HEAD
   expose :deployment_status, with: DetailedStatusEntity
 
-  # expose :deployment_status, if: -> (*) { build.starts_environment? } do
-  #   expose :deployment_status, as: :status
-
-  #   expose :persisted_environment, as: :environment, with: EnvironmentEntity
-  # end
-=======
-  expose :deployment_status, with: DetailedStatusEntity do |build|
-    build.last_deployment.detailed_status
-  end
->>>>>>> Use deployment status in job log page
-
-  # expose :deployment_status, if: -> (*) { build.starts_environment? } do
-  #   expose :deployment_status, as: :status
-
-  #   expose :persisted_environment, as: :environment, with: EnvironmentEntity
-  # end
-
   expose :metadata, using: BuildMetadataEntity
 
   expose :artifact, if: -> (*) { can?(current_user, :read_build, build) } do