Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
95fc5127
Commit
95fc5127
authored
Jan 13, 2022
by
Alishan Ladhani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show blocked status label in deployments view
Changelog: fixed EE: true
parent
d0435d23
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
0 deletions
+15
-0
app/helpers/environment_helper.rb
app/helpers/environment_helper.rb
+2
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
spec/helpers/environment_helper_spec.rb
spec/helpers/environment_helper_spec.rb
+10
-0
No files found.
app/helpers/environment_helper.rb
View file @
95fc5127
...
...
@@ -54,6 +54,8 @@ module EnvironmentHelper
s_
(
'Deployment|canceled'
)
when
'skipped'
s_
(
'Deployment|skipped'
)
when
'blocked'
s_
(
'Deployment|blocked'
)
end
klass
=
"ci-status ci-
#{
status
.
dasherize
}
"
...
...
locale/gitlab.pot
View file @
95fc5127
...
...
@@ -11967,6 +11967,9 @@ msgstr ""
msgid "Deployment|This deployment was created using the API"
msgstr ""
msgid "Deployment|blocked"
msgstr ""
msgid "Deployment|canceled"
msgstr ""
...
...
spec/helpers/environment_helper_spec.rb
View file @
95fc5127
...
...
@@ -21,6 +21,16 @@ RSpec.describe EnvironmentHelper do
expect
(
html
).
to
have_css
(
'a.ci-status.ci-success'
)
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
describe
'#environments_detail_data_json'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment