Merge branch 'move-delete-to-bottom-of-list' into 'master'

Move "Delete comment" button to the bottom of "More actions" list

See merge request gitlab-org/gitlab!35237

app/assets/javascripts/notes/components/note_actions.vue

@@ -257,15 +257,6 @@ export default {
             {{ __('Copy link') }}
           </button>
         </li>
-        <li v-if="canEdit">
-          <button
-            class="btn btn-transparent js-note-delete js-note-delete"
-            type="button"
-            @click.prevent="onDelete"
-          >
-            <span class="text-danger">{{ __('Delete comment') }}</span>
-          </button>
-        </li>
         <li v-if="isIssue">
           <button
             class="btn-default btn-transparent"
@@ -276,6 +267,15 @@ export default {
             {{ displayAssignUserText }}
           </button>
         </li>
+        <li v-if="canEdit">
+          <button
+            class="btn btn-transparent js-note-delete js-note-delete"
+            type="button"
+            @click.prevent="onDelete"
+          >
+            <span class="text-danger">{{ __('Delete comment') }}</span>
+          </button>
+        </li>
       </ul>
     </div>
   </div>

changelogs/unreleased/move-delete-to-bottom-of-list.yml

+---
+title: Move 'Delete comment' button to bottom of 'More actions' list
+merge_request: 35237
+author:
+type: fixed