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
dae4d629
Commit
dae4d629
authored
Jan 20, 2020
by
Sarah Groff Hennigh-Palermo
Committed by
Phil Hughes
Jan 20, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Improve copy of pipelines in the Merge Request widget"
parent
c09b0b23
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
26 deletions
+31
-26
app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_info.vue
..._request_widget/components/deployment/deployment_info.vue
+2
-2
changelogs/unreleased/196861-improve-pipelines-copy.yml
changelogs/unreleased/196861-improve-pipelines-copy.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+2
-2
spec/features/merge_request/user_sees_deployment_widget_spec.rb
...eatures/merge_request/user_sees_deployment_widget_spec.rb
+1
-1
spec/frontend/vue_mr_widget/deployment/deployment_spec.js
spec/frontend/vue_mr_widget/deployment/deployment_spec.js
+21
-21
No files found.
app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_info.vue
View file @
dae4d629
...
...
@@ -32,12 +32,12 @@ export default {
},
},
deployedTextMap
:
{
[
MANUAL_DEPLOY
]:
__
(
'
Can
deploy manually
to
'
),
[
MANUAL_DEPLOY
]:
__
(
'
Can
be manually deployed
to
'
),
[
WILL_DEPLOY
]:
__
(
'
Will deploy to
'
),
[
RUNNING
]:
__
(
'
Deploying to
'
),
[
SUCCESS
]:
__
(
'
Deployed to
'
),
[
FAILED
]:
__
(
'
Failed to deploy to
'
),
[
CANCELED
]:
__
(
'
Canceled deploy to
'
),
[
CANCELED
]:
__
(
'
Canceled deploy
ment
to
'
),
},
computed
:
{
deployTimeago
()
{
...
...
changelogs/unreleased/196861-improve-pipelines-copy.yml
0 → 100644
View file @
dae4d629
---
title
:
Update pipeline status copy in deploy footer
merge_request
:
23199
author
:
type
:
changed
locale/gitlab.pot
View file @
dae4d629
...
...
@@ -3081,7 +3081,7 @@ msgstr ""
msgid "Callback URL"
msgstr ""
msgid "Can
deploy manually
to"
msgid "Can
be manually deployed
to"
msgstr ""
msgid "Can override approvers and approvals required per merge request"
...
...
@@ -3114,7 +3114,7 @@ msgstr ""
msgid "Cancel this job"
msgstr ""
msgid "Canceled deploy to"
msgid "Canceled deploy
ment
to"
msgstr ""
msgid "Cancelling Preview"
...
...
spec/features/merge_request/user_sees_deployment_widget_spec.rb
View file @
dae4d629
...
...
@@ -96,7 +96,7 @@ describe 'Merge request > User sees deployment widget', :js do
visit
project_merge_request_path
(
project
,
merge_request
)
wait_for_requests
expect
(
page
).
to
have_content
(
"Canceled deploy to
#{
environment
.
name
}
"
)
expect
(
page
).
to
have_content
(
"Canceled deploy
ment
to
#{
environment
.
name
}
"
)
expect
(
page
).
not_to
have_css
(
'.js-deploy-time'
)
end
end
...
...
spec/frontend/vue_mr_widget/deployment/deployment_spec.js
View file @
dae4d629
...
...
@@ -57,9 +57,9 @@ describe('Deployment component', () => {
describe
.
each
`
status | previous | deploymentDetails | text | actionButtons
${
CREATED
}
|
${
true
}
|
${
deployDetail
}
|
${
'
Can
deploy manually
to
'
}
|
${
deployGroup
}
${
CREATED
}
|
${
true
}
|
${
deployDetail
}
|
${
'
Can
be manually deployed
to
'
}
|
${
deployGroup
}
${
CREATED
}
|
${
true
}
|
${
noDetails
}
|
${
'
Will deploy to
'
}
|
${
deployGroup
}
${
CREATED
}
|
${
false
}
|
${
deployDetail
}
|
${
'
Can
deploy manually
to
'
}
|
${
noActions
}
${
CREATED
}
|
${
false
}
|
${
deployDetail
}
|
${
'
Can
be manually deployed
to
'
}
|
${
noActions
}
${
CREATED
}
|
${
false
}
|
${
noDetails
}
|
${
'
Will deploy to
'
}
|
${
noActions
}
${
RUNNING
}
|
${
true
}
|
${
deployDetail
}
|
${
'
Deploying to
'
}
|
${
deployGroup
}
${
RUNNING
}
|
${
true
}
|
${
noDetails
}
|
${
'
Deploying to
'
}
|
${
deployGroup
}
...
...
@@ -73,10 +73,10 @@ describe('Deployment component', () => {
${
FAILED
}
|
${
true
}
|
${
noDetails
}
|
${
'
Failed to deploy to
'
}
|
${
deployGroup
}
${
FAILED
}
|
${
false
}
|
${
deployDetail
}
|
${
'
Failed to deploy to
'
}
|
${
noActions
}
${
FAILED
}
|
${
false
}
|
${
noDetails
}
|
${
'
Failed to deploy to
'
}
|
${
noActions
}
${
CANCELED
}
|
${
true
}
|
${
deployDetail
}
|
${
'
Canceled deploy
to
'
}
|
${
deployGroup
}
${
CANCELED
}
|
${
true
}
|
${
noDetails
}
|
${
'
Canceled deploy
to
'
}
|
${
deployGroup
}
${
CANCELED
}
|
${
false
}
|
${
deployDetail
}
|
${
'
Canceled deploy
to
'
}
|
${
noActions
}
${
CANCELED
}
|
${
false
}
|
${
noDetails
}
|
${
'
Canceled deploy
to
'
}
|
${
noActions
}
${
CANCELED
}
|
${
true
}
|
${
deployDetail
}
|
${
'
Canceled deploy
ment to
'
}
|
${
deployGroup
}
${
CANCELED
}
|
${
true
}
|
${
noDetails
}
|
${
'
Canceled deploy
ment to
'
}
|
${
deployGroup
}
${
CANCELED
}
|
${
false
}
|
${
deployDetail
}
|
${
'
Canceled deploy
ment to
'
}
|
${
noActions
}
${
CANCELED
}
|
${
false
}
|
${
noDetails
}
|
${
'
Canceled deploy
ment to
'
}
|
${
noActions
}
`
(
'
$status + previous: $previous + manual: $deploymentDetails.isManual
'
,
({
status
,
previous
,
deploymentDetails
,
text
,
actionButtons
})
=>
{
...
...
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