diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-31 21:10:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-31 21:10:43 +0300 |
| commit | 8846ca0ed691f35ceb91dc4c924cb105a611bea4 (patch) | |
| tree | 47d7d5f37531c27c5087999fef1335e442ccd95e /app/assets/javascripts/related_issues | |
| parent | 2368893df711f330cd210005e616fc3b6003ff31 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/related_issues')
| -rw-r--r-- | app/assets/javascripts/related_issues/constants.js | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/app/assets/javascripts/related_issues/constants.js b/app/assets/javascripts/related_issues/constants.js index 1e95bf22ad2..89eae069a24 100644 --- a/app/assets/javascripts/related_issues/constants.js +++ b/app/assets/javascripts/related_issues/constants.js @@ -1,4 +1,4 @@ -import { __ } from '~/locale'; +import { __, sprintf } from '~/locale'; export const issuableTypesMap = { ISSUE: 'issue', @@ -20,9 +20,21 @@ export const linkedIssueTypesTextMap = { export const autoCompleteTextMap = { true: { - [issuableTypesMap.ISSUE]: __(' or <#issue id>'), - [issuableTypesMap.EPIC]: __(' or <&epic id>'), - [issuableTypesMap.MERGE_REQUEST]: __(' or <!merge request id>'), + [issuableTypesMap.ISSUE]: sprintf( + __(' or %{emphasisStart}#issue id%{emphasisEnd}'), + { emphasisStart: '<', emphasisEnd: '>' }, + false, + ), + [issuableTypesMap.EPIC]: sprintf( + __(' or %{emphasisStart}&epic id%{emphasisEnd}'), + { emphasisStart: '<', emphasisEnd: '>' }, + false, + ), + [issuableTypesMap.MERGE_REQUEST]: sprintf( + __(' or %{emphasisStart}!merge request id%{emphasisEnd}'), + { emphasisStart: '<', emphasisEnd: '>' }, + false, + ), }, false: { [issuableTypesMap.ISSUE]: '', |