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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
febc473f
Commit
febc473f
authored
Nov 20, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds missing status in deployment widget
Renders created and canceled status in MR widget
parent
2ea250d4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
0 deletions
+38
-0
app/assets/javascripts/vue_merge_request_widget/components/deployment.vue
...cripts/vue_merge_request_widget/components/deployment.vue
+2
-0
changelogs/unreleased/53578-fe-deployment-status.yml
changelogs/unreleased/53578-fe-deployment-status.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
spec/javascripts/vue_mr_widget/components/deployment_spec.js
spec/javascripts/vue_mr_widget/components/deployment_spec.js
+28
-0
No files found.
app/assets/javascripts/vue_merge_request_widget/components/deployment.vue
View file @
febc473f
...
@@ -42,6 +42,8 @@ export default {
...
@@ -42,6 +42,8 @@ export default {
running
:
__
(
'
Deploying to
'
),
running
:
__
(
'
Deploying to
'
),
success
:
__
(
'
Deployed to
'
),
success
:
__
(
'
Deployed to
'
),
failed
:
__
(
'
Failed to deploy to
'
),
failed
:
__
(
'
Failed to deploy to
'
),
created
:
__
(
'
Will deploy to
'
),
canceled
:
__
(
'
Failed to deploy to
'
),
},
},
data
()
{
data
()
{
return
{
return
{
...
...
changelogs/unreleased/53578-fe-deployment-status.yml
0 → 100644
View file @
febc473f
---
title
:
Adds states to the deployment widget
merge_request
:
author
:
type
:
added
locale/gitlab.pot
View file @
febc473f
...
@@ -7191,6 +7191,9 @@ msgstr ""
...
@@ -7191,6 +7191,9 @@ msgstr ""
msgid "Wiki|Wiki Pages"
msgid "Wiki|Wiki Pages"
msgstr ""
msgstr ""
msgid "Will deploy to"
msgstr ""
msgid "Withdraw Access Request"
msgid "Withdraw Access Request"
msgstr ""
msgstr ""
...
...
spec/javascripts/vue_mr_widget/components/deployment_spec.js
View file @
febc473f
...
@@ -252,5 +252,33 @@ describe('Deployment component', () => {
...
@@ -252,5 +252,33 @@ describe('Deployment component', () => {
);
);
});
});
});
});
describe
(
'
created
'
,
()
=>
{
beforeEach
(()
=>
{
vm
=
mountComponent
(
Component
,
{
deployment
:
Object
.
assign
({},
deploymentMockData
,
{
status
:
'
created
'
}),
showMetrics
:
true
,
});
});
it
(
'
renders information about created deployment
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.js-deployment-info
'
).
textContent
).
toContain
(
'
Will deploy to
'
);
});
});
describe
(
'
canceled
'
,
()
=>
{
beforeEach
(()
=>
{
vm
=
mountComponent
(
Component
,
{
deployment
:
Object
.
assign
({},
deploymentMockData
,
{
status
:
'
canceled
'
}),
showMetrics
:
true
,
});
});
it
(
'
renders information about canceled deployment
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.js-deployment-info
'
).
textContent
).
toContain
(
'
Failed to deploy to
'
,
);
});
});
});
});
});
});
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