diff options
| author | Julien HENRY <julien.henry@sonarsource.com> | 2017-10-16 16:25:09 +0200 |
|---|---|---|
| committer | Julien HENRY <julien.henry@sonarsource.com> | 2017-10-20 18:45:15 +1000 |
| commit | a45212f715dbf525d0686523b76fcb46f62f101a (patch) | |
| tree | d3eb6b771e7be4a8d579311daa0a59cb24dfdfca /server/sonar-web | |
| parent | 43e50a260031cd9a0eb7638b6136e6208a8783ca (diff) | |
| download | sonarqube-a45212f715dbf525d0686523b76fcb46f62f101a.tar.gz sonarqube-a45212f715dbf525d0686523b76fcb46f62f101a.zip | |
SONAR-9987 Add a changelog entry when copying/merging issues
Diffstat (limited to 'server/sonar-web')
| -rw-r--r-- | server/sonar-web/src/main/js/components/issue/components/IssueChangelogDiff.js | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueChangelogDiff.js b/server/sonar-web/src/main/js/components/issue/components/IssueChangelogDiff.js index e0b1a93556b..f858a13810a 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueChangelogDiff.js +++ b/server/sonar-web/src/main/js/components/issue/components/IssueChangelogDiff.js @@ -43,6 +43,28 @@ export default function IssueChangelogDiff(props /*: { diff: ChangelogDiff } */) </p> ); } + if (diff.key === 'from_long_branch') { + return ( + <p> + {translateWithParameters( + 'issue.change.from_long_branch', + diff.oldValue || '', + diff.newValue || '' + )} + </p> + ); + } + if (diff.key === 'from_short_branch') { + return ( + <p> + {translateWithParameters( + 'issue.change.from_short_branch', + diff.oldValue || '', + diff.newValue || '' + )} + </p> + ); + } let message; if (diff.newValue != null) { |