Merge branch 'temporarily-revert-appending-templates-before-long-term-ux-fix' into 'master'

Stop appending templates - Temporary fix

This is the temporary fix for #23315. This stops the templates appending to any existing text.

See merge request !7050

Signed-off-by: Rémy Coutable <remy@rymai.me>

4 files changed, 8 insertions, 14 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70f3478df1b..05686885656 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ Please view this file on the master branch, on stable branches it's out of date.
   - Refactor and add new environment functionality to CI yaml reference. !7026
   - Fix typo in project settings that prevents users from enabling container registry. !7037
   - Remove extra line for empty issue description. !7045
+  - Don't append issue/MR templates to any existing text. !7050
   - Fix error in generating labels. !7055
   - Stop clearing the database cache on `rake cache:clear`. !7056
   - Only show register tab if signup enabled. !7058
diff --git a/app/assets/javascripts/blob/template_selector.js.es6 b/app/assets/javascripts/blob/template_selector.js.es6
index 4e309e480b0..2d5c6ade053 100644
--- a/app/assets/javascripts/blob/template_selector.js.es6
+++ b/app/assets/javascripts/blob/template_selector.js.es6
@@ -68,14 +68,10 @@
       // To be implemented on the extending class
       // e.g.
       // Api.gitignoreText item.name, @requestFileSuccess.bind(@)
-      requestFileSuccess(file, { skipFocus, append } = {}) {
+      requestFileSuccess(file, { skipFocus } = {}) {
         const oldValue = this.editor.getValue();
         let newValue = file.content;
 
-        if (append && oldValue.length && oldValue !== newValue) {
-          newValue = oldValue + '\n\n' + newValue;
-        }
-
         this.editor.setValue(newValue, 1);
         if (!skipFocus) this.editor.focus();
 
@@ -99,4 +95,3 @@
 
     global.TemplateSelector = TemplateSelector;
   })(window.gl || ( window.gl = {}));
-
diff --git a/app/assets/javascripts/templates/issuable_template_selector.js.es6 b/app/assets/javascripts/templates/issuable_template_selector.js.es6
index bd4e3c3d00d..fa1b79c8415 100644
--- a/app/assets/javascripts/templates/issuable_template_selector.js.es6
+++ b/app/assets/javascripts/templates/issuable_template_selector.js.es6
@@ -32,24 +32,22 @@
         this.currentTemplate = currentTemplate;
         if (err) return; // Error handled by global AJAX error handler
         this.stopLoadingSpinner();
-        this.setInputValueToTemplateContent(true);
+        this.setInputValueToTemplateContent();
       });
       return;
     }
 
-    setInputValueToTemplateContent(append) {
+    setInputValueToTemplateContent() {
       // `this.requestFileSuccess` sets the value of the description input field
-      // to the content of the template selected. If `append` is true, the
-      // template content will be appended to the previous value of the field,
-      // separated by a blank line if the previous value is non-empty.
+      // to the content of the template selected.
       if (this.titleInput.val() === '') {
         // If the title has not yet been set, focus the title input and
         // skip focusing the description input by setting `true` as the
         // `skipFocus` option to `requestFileSuccess`.
-        this.requestFileSuccess(this.currentTemplate, {skipFocus: true, append});
+        this.requestFileSuccess(this.currentTemplate, {skipFocus: true});
         this.titleInput.focus();
       } else {
-        this.requestFileSuccess(this.currentTemplate, {skipFocus: false, append});
+        this.requestFileSuccess(this.currentTemplate, {skipFocus: false});
       }
       return;
     }
diff --git a/spec/features/projects/issuable_templates_spec.rb b/spec/features/projects/issuable_templates_spec.rb
index d886909ce85..2f377312ea5 100644
--- a/spec/features/projects/issuable_templates_spec.rb
+++ b/spec/features/projects/issuable_templates_spec.rb
@@ -77,7 +77,7 @@ feature 'issuable templates', feature: true, js: true do
     scenario 'user selects "bug" template' do
       select_template 'bug'
       wait_for_ajax
-      preview_template("#{prior_description}\n\n#{template_content}")
+      preview_template("#{template_content}")
       save_changes
     end
   end