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
55941213
Commit
55941213
authored
Oct 25, 2019
by
Jason Lenny
Committed by
Filipa Lacerda
Oct 25, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve clarity of text for merge train position
parent
b00ce8e5
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
6 deletions
+11
-6
changelogs/unreleased/jlenny-master-patch-21737.yml
changelogs/unreleased/jlenny-master-patch-21737.yml
+5
-0
ee/app/assets/javascripts/vue_merge_request_widget/components/merge_train_position_indicator.vue
...uest_widget/components/merge_train_position_indicator.vue
+1
-1
ee/spec/frontend/vue_mr_widget/components/merge_train_position_indicator_spec.js
..._widget/components/merge_train_position_indicator_spec.js
+2
-2
locale/gitlab.pot
locale/gitlab.pot
+3
-3
No files found.
changelogs/unreleased/jlenny-master-patch-21737.yml
0 → 100644
View file @
55941213
---
title
:
Improve clarity of text for merge train position
merge_request
:
19031
author
:
type
:
changed
ee/app/assets/javascripts/vue_merge_request_widget/components/merge_train_position_indicator.vue
View file @
55941213
...
...
@@ -11,7 +11,7 @@ export default {
},
computed
:
{
message
()
{
return
sprintf
(
s__
(
'
mrWidget|
Added to
the merge train at position %{mergeTrainPosition}
'
),
{
return
sprintf
(
s__
(
'
mrWidget|
In
the merge train at position %{mergeTrainPosition}
'
),
{
mergeTrainPosition
:
this
.
mergeTrainIndex
+
1
,
});
},
...
...
ee/spec/frontend/vue_mr_widget/components/merge_train_position_indicator_spec.js
View file @
55941213
...
...
@@ -26,7 +26,7 @@ describe('MergeTrainPositionIndicator', () => {
it
(
'
should return the message with the correct position (i.e., index + 1)
'
,
()
=>
{
factory
({
mergeTrainIndex
:
3
});
expect
(
vm
.
message
).
toBe
(
'
Added to
the merge train at position 4
'
);
expect
(
vm
.
message
).
toBe
(
'
In
the merge train at position 4
'
);
});
});
...
...
@@ -34,7 +34,7 @@ describe('MergeTrainPositionIndicator', () => {
it
(
'
should render the correct message
'
,
()
=>
{
factory
({
mergeTrainIndex
:
3
});
expect
(
trimText
(
wrapper
.
text
())).
toBe
(
'
Added to
the merge train at position 4
'
);
expect
(
trimText
(
wrapper
.
text
())).
toBe
(
'
In
the merge train at position 4
'
);
});
});
});
...
...
locale/gitlab.pot
View file @
55941213
...
...
@@ -20040,9 +20040,6 @@ msgstr ""
msgid "mrWidget|%{metricsLinkStart} Memory %{metricsLinkEnd} usage is %{emphasisStart} unchanged %{emphasisEnd} at %{memoryFrom}MB"
msgstr ""
msgid "mrWidget|Added to the merge train at position %{mergeTrainPosition}"
msgstr ""
msgid "mrWidget|Added to the merge train by"
msgstr ""
...
...
@@ -20124,6 +20121,9 @@ msgstr ""
msgid "mrWidget|If the %{missingBranchName} branch exists in your local repository, you can merge this merge request manually using the command line"
msgstr ""
msgid "mrWidget|In the merge train at position %{mergeTrainPosition}"
msgstr ""
msgid "mrWidget|Loading deployment statistics"
msgstr ""
...
...
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