From 295b0466b38f261ad10be72e18c0915f4f646379 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Wed, 3 Oct 2018 17:00:09 +0100
Subject: [PATCH 1/2] Removes icon key from job endpoint

This was added because we thought we'd need
to render the environment status but we
already have this information in the
build status
---
 app/serializers/build_details_entity.rb              | 8 --------
 changelogs/unreleased/50904-remove-icon-env.yml      | 5 +++++
 spec/controllers/projects/jobs_controller_spec.rb    | 1 -
 spec/fixtures/api/schemas/job/deployment_status.json | 2 --
 4 files changed, 5 insertions(+), 11 deletions(-)
 create mode 100644 changelogs/unreleased/50904-remove-icon-env.yml

diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb
index c85b1790e73..3d508a9a407 100644
--- a/app/serializers/build_details_entity.rb
+++ b/app/serializers/build_details_entity.rb
@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
 class BuildDetailsEntity < JobEntity
-  include EnvironmentHelper
-  include RequestAwareEntity
-  include CiStatusHelper
-
   expose :coverage, :erased_at, :duration
   expose :tag_list, as: :tags
   expose :has_trace?, as: :has_trace
@@ -15,10 +11,6 @@ class BuildDetailsEntity < JobEntity
   expose :deployment_status, if: -> (*) { build.has_environment? } do
     expose :deployment_status, as: :status
 
-    expose :icon do |build|
-      ci_label_for_status(build.status)
-    end
-
     expose :persisted_environment, as: :environment, with: EnvironmentEntity
   end
 
diff --git a/changelogs/unreleased/50904-remove-icon-env.yml b/changelogs/unreleased/50904-remove-icon-env.yml
new file mode 100644
index 00000000000..7915d45d6bd
--- /dev/null
+++ b/changelogs/unreleased/50904-remove-icon-env.yml
@@ -0,0 +1,5 @@
+---
+title: Remove icon key from job endopoint
+merge_request:
+author:
+type: other
diff --git a/spec/controllers/projects/jobs_controller_spec.rb b/spec/controllers/projects/jobs_controller_spec.rb
index fd11cb31a2a..30a418c0e88 100644
--- a/spec/controllers/projects/jobs_controller_spec.rb
+++ b/spec/controllers/projects/jobs_controller_spec.rb
@@ -225,7 +225,6 @@ describe Projects::JobsController, :clean_gitlab_redis_shared_state do
           expect(response).to have_gitlab_http_status(:ok)
           expect(json_response).to match_schema('job/job_details')
           expect(json_response['deployment_status']["status"]).to eq 'creating'
-          expect(json_response['deployment_status']["icon"]).to eq 'passed'
           expect(json_response['deployment_status']["environment"]).not_to be_nil
         end
       end
diff --git a/spec/fixtures/api/schemas/job/deployment_status.json b/spec/fixtures/api/schemas/job/deployment_status.json
index a90b8b35654..83b1899fdf3 100644
--- a/spec/fixtures/api/schemas/job/deployment_status.json
+++ b/spec/fixtures/api/schemas/job/deployment_status.json
@@ -2,7 +2,6 @@
   "type": "object",
   "required": [
     "status",
-    "icon",
     "environment"
   ],
   "properties": {
@@ -20,7 +19,6 @@
         { "type": "null" }
       ]
     },
-    "icon": { "type": "string" },
     "environment": { "$ref": "../environment.json" }
   },
   "additionalProperties": false

From d20d52f541a0905a31b9773f0a2ea83ca6235aec Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzegorz@gitlab.com>
Date: Fri, 5 Oct 2018 09:09:39 +0000
Subject: [PATCH 2/2] Delete 50904-remove-icon-env.yml

---
 changelogs/unreleased/50904-remove-icon-env.yml | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 changelogs/unreleased/50904-remove-icon-env.yml

diff --git a/changelogs/unreleased/50904-remove-icon-env.yml b/changelogs/unreleased/50904-remove-icon-env.yml
deleted file mode 100644
index 7915d45d6bd..00000000000
--- a/changelogs/unreleased/50904-remove-icon-env.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove icon key from job endopoint
-merge_request:
-author:
-type: other