Merge branch '50904-remove-icon-env' into 'master'
Removes icon key from job endpoint See merge request gitlab-org/gitlab-ce!22085
This commit is contained in:
commit
c350f3ccd8
3 changed files with 0 additions and 11 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue