From a45212f715dbf525d0686523b76fcb46f62f101a Mon Sep 17 00:00:00 2001
From: Julien HENRY <julien.henry@sonarsource.com>
Date: Mon, 16 Oct 2017 16:25:09 +0200
Subject: SONAR-9987 Add a changelog entry when copying/merging issues

---
 .../issue/components/IssueChangelogDiff.js         | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'server/sonar-web')

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) {
-- 
cgit v1.2.3