Keep input data after creating existing tag

7b258903 · Sam Rose · 8b9cd3c0 · 7b258903 · 7b258903 · 7b258903
--- a/app/views/projects/_zen.html.haml
+++ b/app/views/projects/_zen.html.haml
@@ -5,6 +5,6 @@
  - if defined?(f) && f
    = f.text_area attr, class: classes, placeholder: placeholder, data: { supports_slash_commands: supports_slash_commands }
  - else
-    = text_area_tag attr, nil, class: classes, placeholder: placeholder
+    = text_area_tag attr, text, class: classes, placeholder: placeholder
  %a.zen-control.zen-control-leave.js-zen-leave{ href: "#" }
    = icon('compress')
--- a/app/views/projects/tags/new.html.haml
+++ b/app/views/projects/tags/new.html.haml
@@ -22,14 +22,14 @@
  .form-group
    = label_tag :message, nil, class: 'control-label'
    .col-sm-10
-      = text_area_tag :message, nil, required: false, tabindex: 3, class: 'form-control', rows: 5
+      = text_area_tag :message, params[:message], required: false, tabindex: 3, class: 'form-control', rows: 5
      .help-block Optionally, add a message to the tag.
  %hr
  .form-group
    = label_tag :release_description, 'Release notes', class: 'control-label'
    .col-sm-10
      = render layout: 'projects/md_preview', locals: { url: preview_markdown_path(@project), referenced_users: true } do
-        = render 'projects/zen', attr: :release_description, classes: 'note-textarea', placeholder: "Write your release notes or drag files here..."
+        = render 'projects/zen', attr: :release_description, classes: 'note-textarea', placeholder: "Write your release notes or drag files here...", text: params[:release_description]
        = render 'shared/notes/hints'
      .help-block Optionally, add release notes to the tag. They will be stored in the GitLab database and displayed on the tags page.
  .form-actions

--- a/changelogs/unreleased/31625-tag-editor-loses-all-inputs-when-you-try-to-add-a-tag-that-already-exists.yml
+++ b/changelogs/unreleased/31625-tag-editor-loses-all-inputs-when-you-try-to-add-a-tag-that-already-exists.yml
+---
+title: Keep input data after creating a tag that already exists
+merge_request: 11155
+author: