From 29cbfe6f170215efe5267b9f45f635fa76a2349a Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 22 Oct 2022 13:53:03 +0200
Subject: [PATCH 1/5] feat: add button to quickly clear merge message

---
 options/locale/locale_en-US.ini                | 1 +
 templates/repo/issue/view_content/pull.tmpl    | 2 ++
 web_src/js/components/PullRequestMergeForm.vue | 6 ++++++
 3 files changed, 9 insertions(+)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index a35c6a668af4a..2636fff282478 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1618,6 +1618,7 @@ pulls.reopened_at = `reopened this pull request <a id="%[1]s" href="#%[1]s">%[2]
 pulls.merge_instruction_hint = `You can also view <a class="show-instruction">command line instructions</a>.`
 pulls.merge_instruction_step1_desc = From your project repository, check out a new branch and test the changes.
 pulls.merge_instruction_step2_desc = Merge the changes and update on Gitea.
+pulls.clear_merge_message = Clear merge message
 
 pulls.auto_merge_button_when_succeed = (When checks succeed)
 pulls.auto_merge_when_succeed = Auto merge when all checks succeed
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
index 1e07225300bba..df53cfb3a021a 100644
--- a/templates/repo/issue/view_content/pull.tmpl
+++ b/templates/repo/issue/view_content/pull.tmpl
@@ -351,6 +351,7 @@
 									'textAutoMergeButtonWhenSucceed': {{$.locale.Tr "repo.pulls.auto_merge_button_when_succeed"}},
 									'textAutoMergeWhenSucceed': {{$.locale.Tr "repo.pulls.auto_merge_when_succeed"}},
 									'textAutoMergeCancelSchedule': {{$.locale.Tr "repo.pulls.auto_merge_cancel_schedule"}},
+									'textClearMergeMessage': {{$.locale.Tr "repo.pulls.clear_merge_message"}},
 
 									'canMergeNow': {{$canMergeNow}},
 									'allOverridableChecksOk': {{not $notAllOverridableChecksOk}},
@@ -360,6 +361,7 @@
 									'defaultMergeStyle': {{.MergeStyle}},
 									'defaultDeleteBranchAfterMerge': {{$prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge}},
 									'mergeMessageFieldPlaceHolder': {{$.locale.Tr "repo.editor.commit_message_desc"}},
+									'defaultMergeMessage': defaultMergeMessage,
 
 									'hasPendingPullRequestMerge': {{.HasPendingPullRequestMerge}},
 									'hasPendingPullRequestMergeTip': {{$hasPendingPullRequestMergeTip}},
diff --git a/web_src/js/components/PullRequestMergeForm.vue b/web_src/js/components/PullRequestMergeForm.vue
index bfe05628e84aa..e601ace90cc0c 100644
--- a/web_src/js/components/PullRequestMergeForm.vue
+++ b/web_src/js/components/PullRequestMergeForm.vue
@@ -25,6 +25,9 @@
           </div>
           <div class="field">
             <textarea name="merge_message_field" rows="5" :placeholder="mergeForm.mergeMessageFieldPlaceHolder" v-model="mergeMessageFieldValue"/>
+            <button v-if="mergeMessageFieldValue !== mergeForm.defaultMergeMessage" @click.prevent="clearMergeMessage" class="ui tertiary button">
+              {{ mergeForm.textClearMergeMessage }}
+            </button>
           </div>
         </template>
 
@@ -174,6 +177,9 @@ export default {
       this.mergeStyle = name;
       this.autoMergeWhenSucceed = autoMerge;
     },
+    clearMergeMessage() {
+      this.mergeMessageFieldValue = this.mergeForm.defaultMergeMessage
+    },
   },
 };
 </script>

From 49aaa81bd558576548997fa0b27531c7cc6a4ead Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sat, 22 Oct 2022 22:13:58 +0200
Subject: [PATCH 2/5] fix: lint

---
 web_src/js/components/PullRequestMergeForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/js/components/PullRequestMergeForm.vue b/web_src/js/components/PullRequestMergeForm.vue
index e601ace90cc0c..27a203d345cee 100644
--- a/web_src/js/components/PullRequestMergeForm.vue
+++ b/web_src/js/components/PullRequestMergeForm.vue
@@ -178,7 +178,7 @@ export default {
       this.autoMergeWhenSucceed = autoMerge;
     },
     clearMergeMessage() {
-      this.mergeMessageFieldValue = this.mergeForm.defaultMergeMessage
+      this.mergeMessageFieldValue = this.mergeForm.defaultMergeMessage;
     },
   },
 };

From e88bf882f1f7b1e1f2277602fd8fbbd4405157f5 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Mon, 31 Oct 2022 21:00:14 +0100
Subject: [PATCH 3/5] feat: add hint about what exactly will be cleared

---
 options/locale/locale_en-US.ini                |  1 +
 templates/repo/issue/view_content/pull.tmpl    |  1 +
 web_src/js/components/PullRequestMergeForm.vue | 11 ++++++++---
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 2636fff282478..d29da4084dfe8 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1619,6 +1619,7 @@ pulls.merge_instruction_hint = `You can also view <a class="show-instruction">co
 pulls.merge_instruction_step1_desc = From your project repository, check out a new branch and test the changes.
 pulls.merge_instruction_step2_desc = Merge the changes and update on Gitea.
 pulls.clear_merge_message = Clear merge message
+pulls.clear_merge_message_hint = Clearing the merge message will only remove the commit message content and keep generated git trailers.
 
 pulls.auto_merge_button_when_succeed = (When checks succeed)
 pulls.auto_merge_when_succeed = Auto merge when all checks succeed
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
index df53cfb3a021a..9e0909064de1a 100644
--- a/templates/repo/issue/view_content/pull.tmpl
+++ b/templates/repo/issue/view_content/pull.tmpl
@@ -352,6 +352,7 @@
 									'textAutoMergeWhenSucceed': {{$.locale.Tr "repo.pulls.auto_merge_when_succeed"}},
 									'textAutoMergeCancelSchedule': {{$.locale.Tr "repo.pulls.auto_merge_cancel_schedule"}},
 									'textClearMergeMessage': {{$.locale.Tr "repo.pulls.clear_merge_message"}},
+									'textClearMergeMessageHint': {{$.locale.Tr "repo.pulls.clear_merge_message_hint"}},
 
 									'canMergeNow': {{$canMergeNow}},
 									'allOverridableChecksOk': {{not $notAllOverridableChecksOk}},
diff --git a/web_src/js/components/PullRequestMergeForm.vue b/web_src/js/components/PullRequestMergeForm.vue
index 27a203d345cee..ef8ec59be3c2e 100644
--- a/web_src/js/components/PullRequestMergeForm.vue
+++ b/web_src/js/components/PullRequestMergeForm.vue
@@ -25,9 +25,14 @@
           </div>
           <div class="field">
             <textarea name="merge_message_field" rows="5" :placeholder="mergeForm.mergeMessageFieldPlaceHolder" v-model="mergeMessageFieldValue"/>
-            <button v-if="mergeMessageFieldValue !== mergeForm.defaultMergeMessage" @click.prevent="clearMergeMessage" class="ui tertiary button">
-              {{ mergeForm.textClearMergeMessage }}
-            </button>
+            <template v-if="mergeMessageFieldValue !== mergeForm.defaultMergeMessage">
+              <button @click.prevent="clearMergeMessage" class="ui tertiary button">
+                {{ mergeForm.textClearMergeMessage }}
+              </button>
+              <div class="ui label">
+                {{ mergeForm.textClearMergeMessageHint }}
+              </div>
+            </template>
           </div>
         </template>
 

From 2e43ec0247f017ff159369fe0ac970b829f19824 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Thu, 10 Nov 2022 14:52:39 +0100
Subject: [PATCH 4/5] Update web_src/js/components/PullRequestMergeForm.vue

Co-authored-by: delvh <dev.lh@web.de>
---
 web_src/js/components/PullRequestMergeForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/js/components/PullRequestMergeForm.vue b/web_src/js/components/PullRequestMergeForm.vue
index ef8ec59be3c2e..1fec12dd5a0ad 100644
--- a/web_src/js/components/PullRequestMergeForm.vue
+++ b/web_src/js/components/PullRequestMergeForm.vue
@@ -29,7 +29,7 @@
               <button @click.prevent="clearMergeMessage" class="ui tertiary button">
                 {{ mergeForm.textClearMergeMessage }}
               </button>
-              <div class="ui label">
+              <div class="ui label"><!-- TODO: Convert to tooltip once we can use tooltips in Vue templates -->
                 {{ mergeForm.textClearMergeMessageHint }}
               </div>
             </template>

From f44960e0c7cf025902a0664806b12dbb9c2a938c Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Thu, 10 Nov 2022 15:56:44 +0100
Subject: [PATCH 5/5] Update options/locale/locale_en-US.ini

Co-authored-by: delvh <dev.lh@web.de>
---
 options/locale/locale_en-US.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 6d17b8fc349ea..88a258a5c99ca 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1626,7 +1626,7 @@ pulls.merge_instruction_hint = `You can also view <a class="show-instruction">co
 pulls.merge_instruction_step1_desc = From your project repository, check out a new branch and test the changes.
 pulls.merge_instruction_step2_desc = Merge the changes and update on Gitea.
 pulls.clear_merge_message = Clear merge message
-pulls.clear_merge_message_hint = Clearing the merge message will only remove the commit message content and keep generated git trailers.
+pulls.clear_merge_message_hint = Clearing the merge message will only remove the commit message content and keep generated git trailers such as "Co-Authored-By …".
 
 pulls.auto_merge_button_when_succeed = (When checks succeed)
 pulls.auto_merge_when_succeed = Auto merge when all checks succeed