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
c7c85a1a
Commit
c7c85a1a
authored
Jan 23, 2019
by
Sam Bigelow
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update ee gitlab.pot
Fix compatability issue
parent
3c397105
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
9 deletions
+3
-9
ee/spec/javascripts/vue_mr_widget/ee_mr_widget_options_spec.js
...ec/javascripts/vue_mr_widget/ee_mr_widget_options_spec.js
+2
-2
locale/gitlab.pot
locale/gitlab.pot
+1
-7
No files found.
ee/spec/javascripts/vue_mr_widget/ee_mr_widget_options_spec.js
View file @
c7c85a1a
...
...
@@ -769,7 +769,7 @@ describe('ee merge request widget options', () => {
vm
.
$nextTick
(()
=>
{
const
tooltip
=
vm
.
$el
.
querySelector
(
'
.fa-question-circle
'
);
expect
(
vm
.
$el
.
textContent
).
toContain
(
'
Remov
es source branch
'
);
expect
(
vm
.
$el
.
textContent
).
toContain
(
'
Delet
es source branch
'
);
expect
(
tooltip
.
getAttribute
(
'
data-original-title
'
)).
toBe
(
'
A user with write access to the source branch selected this option
'
,
);
...
...
@@ -784,7 +784,7 @@ describe('ee merge request widget options', () => {
vm
.
mr
.
state
=
'
merged
'
;
vm
.
$nextTick
(()
=>
{
expect
(
vm
.
$el
.
textContent
).
toContain
(
'
The source branch has been
remov
ed
'
);
expect
(
vm
.
$el
.
textContent
).
toContain
(
'
The source branch has been
delet
ed
'
);
expect
(
vm
.
$el
.
textContent
).
not
.
toContain
(
'
Removes source branch
'
);
done
();
...
...
locale/gitlab.pot
View file @
c7c85a1a
...
...
@@ -362,7 +362,7 @@ msgstr ""
msgid "<strong>%{pushes}</strong> pushes, more than <strong>%{commits}</strong> commits by <strong>%{people}</strong> contributors."
msgstr ""
msgid "<strong>
Remov
es</strong> source branch"
msgid "<strong>
Delet
es</strong> source branch"
msgstr ""
msgid "A 'Runner' is a process which runs a job. You can set up as many Runners as you need."
...
...
@@ -11061,12 +11061,6 @@ msgstr ""
msgid "mrWidget|Refreshing now"
msgstr ""
msgid "mrWidget|Remove Source Branch"
msgstr ""
msgid "mrWidget|Remove source branch"
msgstr ""
msgid "mrWidget|Remove your approval"
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