Commit 62fcdefa authored by Kerri Miller's avatar Kerri Miller

Merge branch 'ali/add-blocked-status-to-deployment-view' into 'master'

Show blocked status label in deployments view

See merge request gitlab-org/gitlab!78234
parents ee37e481 95fc5127
...@@ -54,6 +54,8 @@ module EnvironmentHelper ...@@ -54,6 +54,8 @@ module EnvironmentHelper
s_('Deployment|canceled') s_('Deployment|canceled')
when 'skipped' when 'skipped'
s_('Deployment|skipped') s_('Deployment|skipped')
when 'blocked'
s_('Deployment|blocked')
end end
klass = "ci-status ci-#{status.dasherize}" klass = "ci-status ci-#{status.dasherize}"
......
...@@ -11988,6 +11988,9 @@ msgstr "" ...@@ -11988,6 +11988,9 @@ msgstr ""
msgid "Deployment|This deployment was created using the API" msgid "Deployment|This deployment was created using the API"
msgstr "" msgstr ""
msgid "Deployment|blocked"
msgstr ""
msgid "Deployment|canceled" msgid "Deployment|canceled"
msgstr "" msgstr ""
......
...@@ -21,6 +21,16 @@ RSpec.describe EnvironmentHelper do ...@@ -21,6 +21,16 @@ RSpec.describe EnvironmentHelper do
expect(html).to have_css('a.ci-status.ci-success') expect(html).to have_css('a.ci-status.ci-success')
end end
end end
context 'for a blocked deployment' do
subject { helper.render_deployment_status(deployment) }
let(:deployment) { build(:deployment, :blocked) }
it 'indicates the status' do
expect(subject).to have_text('blocked')
end
end
end end
describe '#environments_detail_data_json' do describe '#environments_detail_data_json' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment