Merge branch 'issue-detail-view-deprecated-button' into 'master'

Remove deprecated button classes from issue detail view

See merge request gitlab-org/gitlab!57763

app/assets/javascripts/issue_show/components/header_actions.vue

@@ -25,7 +25,6 @@ export default {
   },
   actionPrimary: {
     text: __('Yes, close issue'),
-    attributes: [{ variant: 'warning' }],
   },
   i18n: {
     promoteErrorMessage: __(
@@ -220,7 +219,6 @@ export default {
     <gl-button
       v-if="showToggleIssueStateButton"
       class="gl-display-none gl-sm-display-inline-flex!"
-      category="secondary"
       :data-qa-selector="qaSelector"
       :loading="isToggleStateButtonLoading"
       @click="toggleIssueState"

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

@@ -336,7 +336,7 @@ export default {
       icon="pencil"
       size="small"
       category="tertiary"
-      class="note-action-button js-note-edit btn btn-transparent"
+      class="note-action-button js-note-edit"
       data-qa-selector="note_edit_button"
       @click="onEdit"
     />
@@ -348,7 +348,7 @@ export default {
       size="small"
       icon="remove"
       category="tertiary"
-      class="note-action-button js-note-delete btn btn-transparent"
+      class="note-action-button js-note-delete"
       @click="onDelete"
     />
     <div v-else-if="shouldShowActionsDropdown" class="dropdown more-actions">
@@ -359,7 +359,7 @@ export default {
         icon="ellipsis_v"
         size="small"
         category="tertiary"
-        class="note-action-button more-actions-toggle btn btn-transparent"
+        class="note-action-button more-actions-toggle"
         data-toggle="dropdown"
         @click="closeTooltip"
       />

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

@@ -424,7 +424,7 @@ export default {
             <gl-button
               :disabled="isDisabled"
               category="primary"
-              variant="success"
+              variant="confirm"
               data-qa-selector="reply_comment_button"
               class="gl-mr-3 js-vue-issue-save js-comment-button"
               @click="handleUpdate()"

app/views/shared/notes/_comment_button.html.haml

@@ -4,7 +4,7 @@
   %input.btn.gl-button.btn-confirm.js-comment-button.js-comment-submit-button{ type: 'submit', value: _('Comment'), data: { qa_selector: 'comment_button' } }
 
   - if @note.can_be_discussion_note?
-    = button_tag type: 'button', class: 'gl-button btn dropdown-toggle btn-confirm btn-icon js-note-new-discussion js-disable-on-submit', data: { 'dropdown-trigger' => '#resolvable-comment-menu' }, 'aria-label' => _('Open comment type dropdown') do
+    = button_tag type: 'button', class: 'gl-button btn dropdown-toggle btn-confirm js-note-new-discussion js-disable-on-submit', data: { 'dropdown-trigger' => '#resolvable-comment-menu' }, 'aria-label' => _('Open comment type dropdown') do
       = sprite_icon('chevron-down')
 
     %ul#resolvable-comment-menu.dropdown-menu.dropdown-open-top{ data: { dropdown: true } }

changelogs/unreleased/issue-detail-view-deprecated-button.yml

+---
+title: Remove deprecated button classes from issue detail view
+merge_request: 57763
+author:
+type: changed

spec/features/merge_request/user_posts_notes_spec.rb

@@ -173,7 +173,7 @@ RSpec.describe 'Merge request > User posts notes', :js do
       it 'allows using markdown buttons after saving a note and then trying to edit it again' do
         page.within('.current-note-edit-form') do
           fill_in 'note[note]', with: 'This is the new content'
-          find('.btn-success').click
+          find('.btn-confirm').click
         end
 
         find('.note').hover
@@ -191,7 +191,7 @@ RSpec.describe 'Merge request > User posts notes', :js do
       it 'appends the edited at time to the note' do
         page.within('.current-note-edit-form') do
           fill_in 'note[note]', with: 'Some new content'
-          find('.btn-success').click
+          find('.btn-confirm').click
         end
 
         page.within("#note_#{note.id}") do