From b7e6c898c7449eb48744b7312dbfa6baa92a00d6 Mon Sep 17 00:00:00 2001
From: Ezekiel Kigbo <ekigbo@gitlab.com>
Date: Wed, 21 Aug 2019 14:47:04 +0000
Subject: [PATCH] Resolve "HTML code shown in merge request"

- Fixes double escaped text in `mr_widget_rebase.vue`
---
 .../components/states/mr_widget_rebase.vue     |  1 +
 .../32032-html-code-shown-in-merge-request.yml |  5 +++++
 .../components/mr_widget_rebase_spec.js        | 18 ++++++++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 changelogs/unreleased/32032-html-code-shown-in-merge-request.yml

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
index c7b064b8506..339e154affc 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
@@ -50,6 +50,7 @@ export default {
           startTag: '<span class="label-branch">',
           endTag: '</span>',
         },
+        false,
       );
     },
   },
diff --git a/changelogs/unreleased/32032-html-code-shown-in-merge-request.yml b/changelogs/unreleased/32032-html-code-shown-in-merge-request.yml
new file mode 100644
index 00000000000..ffd58067784
--- /dev/null
+++ b/changelogs/unreleased/32032-html-code-shown-in-merge-request.yml
@@ -0,0 +1,5 @@
+---
+title: Fix HTML rendering for fast-forward rebases in merge request widget
+merge_request: 32032
+author:
+type: fixed
diff --git a/spec/javascripts/vue_mr_widget/components/mr_widget_rebase_spec.js b/spec/javascripts/vue_mr_widget/components/mr_widget_rebase_spec.js
index 212519743aa..7216ad00cc1 100644
--- a/spec/javascripts/vue_mr_widget/components/mr_widget_rebase_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/mr_widget_rebase_spec.js
@@ -83,6 +83,24 @@ describe('Merge request widget rebase component', () => {
       expect(text).toContain('foo');
       expect(text.replace(/\s\s+/g, ' ')).toContain('to allow this merge request to be merged.');
     });
+
+    it('should render the correct target branch name', () => {
+      const targetBranch = 'fake-branch-to-test-with';
+      vm = mountComponent(Component, {
+        mr: {
+          rebaseInProgress: false,
+          canPushToSourceBranch: false,
+          targetBranch,
+        },
+        service: {},
+      });
+
+      const elem = vm.$el.querySelector('.rebase-state-find-class-convention span');
+
+      expect(elem.innerHTML).toContain(
+        `Fast-forward merge is not possible. Rebase the source branch onto <span class="label-branch">${targetBranch}</span> to allow this merge request to be merged.`,
+      );
+    });
   });
 
   describe('methods', () => {