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
6ada4245
Commit
6ada4245
authored
Oct 20, 2021
by
JeremyWuuuuu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix follow-up ZenTao string issue
Add namespace for ZenTao user to prevent potential error
parent
05914949
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
6 deletions
+3
-6
ee/app/assets/javascripts/integrations/zentao/issues_show/components/sidebar/zentao_issues_sidebar_root.vue
...es_show/components/sidebar/zentao_issues_sidebar_root.vue
+2
-2
ee/spec/frontend/integrations/zentao/issues_show/components/sidebar/zentao_issues_sidebar_root_spec.js
...how/components/sidebar/zentao_issues_sidebar_root_spec.js
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+0
-3
No files found.
ee/app/assets/javascripts/integrations/zentao/issues_show/components/sidebar/zentao_issues_sidebar_root.vue
View file @
6ada4245
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
import
Assignee
from
'
ee/external_issues_show/components/sidebar/assignee.vue
'
;
import
Assignee
from
'
ee/external_issues_show/components/sidebar/assignee.vue
'
;
import
IssueDueDate
from
'
ee/external_issues_show/components/sidebar/issue_due_date.vue
'
;
import
IssueDueDate
from
'
ee/external_issues_show/components/sidebar/issue_due_date.vue
'
;
import
IssueField
from
'
ee/external_issues_show/components/sidebar/issue_field.vue
'
;
import
IssueField
from
'
ee/external_issues_show/components/sidebar/issue_field.vue
'
;
import
{
__
}
from
'
~/locale
'
;
import
{
s__
,
__
}
from
'
~/locale
'
;
import
LabelsSelect
from
'
~/vue_shared/components/sidebar/labels_select_vue/labels_select_root.vue
'
;
import
LabelsSelect
from
'
~/vue_shared/components/sidebar/labels_select_vue/labels_select_root.vue
'
;
export
default
{
export
default
{
...
@@ -31,7 +31,7 @@ export default {
...
@@ -31,7 +31,7 @@ export default {
i18n
:
{
i18n
:
{
statusTitle
:
__
(
'
Status
'
),
statusTitle
:
__
(
'
Status
'
),
referenceName
:
__
(
'
Reference
'
),
referenceName
:
__
(
'
Reference
'
),
avatarSubLabel
:
__
(
'
Zent
ao user
'
),
avatarSubLabel
:
s__
(
'
ZenTaoIntegration|ZenT
ao user
'
),
},
},
};
};
</
script
>
</
script
>
...
...
ee/spec/frontend/integrations/zentao/issues_show/components/sidebar/zentao_issues_sidebar_root_spec.js
View file @
6ada4245
...
@@ -44,7 +44,7 @@ describe('ZentaoIssuesSidebar', () => {
...
@@ -44,7 +44,7 @@ describe('ZentaoIssuesSidebar', () => {
const
assignee
=
findAssignee
();
const
assignee
=
findAssignee
();
expect
(
assignee
.
props
(
'
assignee
'
)).
toBe
(
mockZentaoIssue
.
assignees
[
0
]);
expect
(
assignee
.
props
(
'
assignee
'
)).
toBe
(
mockZentaoIssue
.
assignees
[
0
]);
expect
(
assignee
.
props
(
'
avatarSubLabel
'
)).
toBe
(
'
Zen
t
ao user
'
);
expect
(
assignee
.
props
(
'
avatarSubLabel
'
)).
toBe
(
'
Zen
T
ao user
'
);
});
});
it
(
'
renders IssueDueDate
'
,
()
=>
{
it
(
'
renders IssueDueDate
'
,
()
=>
{
...
...
locale/gitlab.pot
View file @
6ada4245
...
@@ -39678,9 +39678,6 @@ msgstr ""
...
@@ -39678,9 +39678,6 @@ msgstr ""
msgid "Zentao issues"
msgid "Zentao issues"
msgstr ""
msgstr ""
msgid "Zentao user"
msgstr ""
msgid "ZentaoIntegration|An error occurred while requesting data from the ZenTao service."
msgid "ZentaoIntegration|An error occurred while requesting data from the ZenTao service."
msgstr ""
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